File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -300,6 +300,11 @@ elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "WINDOWS")
300300 list (APPEND swift_core_private_link_libraries shell32;DbgHelp;Synchronization)
301301endif ()
302302
303+ # There is a race condition with building the 'tools' CMake build of the compiler,
304+ # which produces libSwiftScan that the compiler building the standard library may attempt to use.
305+ # Since the current build system makes establishing this dependency relationship exceedingly difficult,
306+ # we attempt to work around it by disabling use of 'libSwiftScan' here.
307+ list (APPEND swift_stdlib_compile_flags "-nonlib-dependency-scanner" )
303308if (NOT "${CMAKE_BUILD_TYPE} " STREQUAL "MinSizeRel" )
304309 list (APPEND swift_stdlib_compile_flags "-Xllvm" "-sil-inline-generics" )
305310 list (APPEND swift_stdlib_compile_flags "-Xllvm" "-sil-partial-specialization" )
@@ -452,7 +457,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
452457 GYB_SOURCES ${SWIFTLIB_EMBEDDED_GYB_SOURCES}
453458 SWIFT_COMPILE_FLAGS
454459 ${swift_stdlib_compile_flags} -Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding -enable-experimental-feature Embedded
455- -Xfrontend -enable-ossa-modules
460+ -Xfrontend -enable-ossa-modules -nonlib-dependency-scanner
456461 MODULE_DIR "${CMAKE_BINARY_DIR} /lib/swift/embedded"
457462 SDK "embedded"
458463 ARCHITECTURE "${arch} "
You can’t perform that action at this time.
0 commit comments