Skip to content

Commit 8d760a1

Browse files
authored
Merge pull request #77630 from artemcm/60DisableLibSwiftScanOnStdLib
[6.0 🍒][CMake] Disable use of in-process 'libSwiftScan' queries when building the Standard Library
2 parents 60ed12e + f8e5dd0 commit 8d760a1

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

stdlib/public/core/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,11 @@ elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "WINDOWS")
294294
list(APPEND swift_core_private_link_libraries shell32;DbgHelp;Synchronization)
295295
endif()
296296

297+
# There is a race condition with building the 'tools' CMake build of the compiler,
298+
# which produces libSwiftScan that the compiler building the standard library may attempt to use.
299+
# Since the current build system makes establishing this dependency relationship exceedingly difficult,
300+
# we attempt to work around it by disabling use of 'libSwiftScan' here.
301+
list(APPEND swift_stdlib_compile_flags "-nonlib-dependency-scanner")
297302
if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel")
298303
list(APPEND swift_stdlib_compile_flags "-Xllvm" "-sil-inline-generics")
299304
list(APPEND swift_stdlib_compile_flags "-Xllvm" "-sil-partial-specialization")
@@ -439,7 +444,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
439444
GYB_SOURCES ${SWIFTLIB_EMBEDDED_GYB_SOURCES}
440445
SWIFT_COMPILE_FLAGS
441446
${swift_stdlib_compile_flags} -Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding -enable-experimental-feature Embedded
442-
-Xfrontend -enable-ossa-modules
447+
-Xfrontend -enable-ossa-modules -nonlib-dependency-scanner
443448
MODULE_DIR "${CMAKE_BINARY_DIR}/lib/swift/embedded"
444449
SDK "embedded"
445450
ARCHITECTURE "${arch}"

0 commit comments

Comments
 (0)