Skip to content

Commit c8e2a96

Browse files
committed
[CMake] Cope with circular dependencies by tweaking link order.
Linux (rather, gold) is stricter than macOS (ld64) about this, so until we can eliminate the rest of the dependencies this is the best workaround we have. (cherry picked from commit 9e2577d)
1 parent 121ebb0 commit c8e2a96

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

tools/sil-passpipeline-dumper/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ add_swift_host_tool(sil-passpipeline-dumper
66
swiftSILOptimizer
77
swiftSerialization
88
swiftClangImporter
9+
# FIXME: Circular dependencies require re-listing these libraries.
10+
swiftSema
11+
swiftAST
912
LLVM_COMPONENT_DEPENDS
1013
DebugInfoCodeView
1114
SWIFT_COMPONENT tools

unittests/Parse/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ add_swift_unittest(SwiftParseTests
66

77
target_link_libraries(SwiftParseTests
88
swiftSIL
9-
swiftSema
109
swiftClangImporter
1110
swiftParse
1211
swiftAST
12+
# FIXME: Sema must go last because of circular dependencies with AST.
13+
swiftSema
1314
)
1415

0 commit comments

Comments
 (0)