Skip to content

Commit 2001318

Browse files
committed
[CMake] Link to swift-syntax libriares from lib/swift/host.
1 parent d069fff commit 2001318

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
569569
570570
if(SWIFT_SWIFT_PARSER)
571571
# Make sure we can find the early SwiftSyntax libraries.
572-
target_link_directories(${target} PRIVATE "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib")
572+
target_link_directories(${target} PRIVATE "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib/swift/host")
573573
574574
# For the "end step" of bootstrapping configurations on Darwin, need to be
575575
# able to fall back to the SDK directory for libswiftCore et al.

lib/ASTGen/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ if (SWIFT_SWIFT_PARSER)
8787
)
8888

8989
target_include_directories(swiftASTGen PUBLIC
90-
"${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/swift")
90+
"${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib/swift/host")
9191

9292
set_property(GLOBAL APPEND PROPERTY SWIFT_EXPORTS swiftASTGen)
9393
endif()

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
157157

158158
if(SWIFT_SWIFT_PARSER)
159159
# Make sure we can find the early SwiftSyntax libraries.
160-
target_link_directories(${target} PRIVATE "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib")
160+
target_link_directories(${target} PRIVATE "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib/swift/host")
161161

162162
# For the "end step" of bootstrapping configurations on Darwin, need to be
163163
# able to fall back to the SDK directory for libswiftCore et al.

0 commit comments

Comments
 (0)