Skip to content

Commit 3624201

Browse files
committed
Merge remote-tracking branch 'origin/main' into rebranch
2 parents 93ba352 + fd6a494 commit 3624201

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

stdlib/cmake/modules/AddSwiftStdlib.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2981,13 +2981,21 @@ function(add_swift_target_executable name)
29812981
"-${SWIFT_SDK_${sdk}_LIB_SUBDIR}"
29822982
SWIFTEXE_TARGET_DEPENDS_with_suffix)
29832983

2984+
# Note: we add ${swiftexe_link_libraries_targets} to the DEPENDS
2985+
# below because when --bootstrapping=bootstrapping with
2986+
# skip-early-swiftsyntax, the build system builds the Swift compiler
2987+
# but not the standard library during the bootstrap, and then when
2988+
# it tries to build swift-backtrace it fails because *the compiler*
2989+
# refers to a libswiftCore.so that can't be found.
2990+
29842991
_add_swift_target_executable_single(
29852992
${VARIANT_NAME}
29862993
${SWIFTEXE_TARGET_NOSWIFTRT_keyword}
29872994
${SWIFTEXE_TARGET_SOURCES}
29882995
DEPENDS
29892996
${SWIFTEXE_TARGET_DEPENDS_with_suffix}
29902997
${swiftexe_module_dependency_targets}
2998+
${swiftexe_link_libraries_targets}
29912999
SDK "${sdk}"
29923000
ARCHITECTURE "${arch}"
29933001
COMPILE_FLAGS

0 commit comments

Comments
 (0)