Skip to content

Commit d8119ef

Browse files
committed
Revert "[NFC][CMake] Disable use of in-process 'libSwiftScan' queries when building the Standard Library"
1 parent 8d760a1 commit d8119ef

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

stdlib/public/core/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,6 @@ 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")
302297
if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel")
303298
list(APPEND swift_stdlib_compile_flags "-Xllvm" "-sil-inline-generics")
304299
list(APPEND swift_stdlib_compile_flags "-Xllvm" "-sil-partial-specialization")
@@ -444,7 +439,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
444439
GYB_SOURCES ${SWIFTLIB_EMBEDDED_GYB_SOURCES}
445440
SWIFT_COMPILE_FLAGS
446441
${swift_stdlib_compile_flags} -Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding -enable-experimental-feature Embedded
447-
-Xfrontend -enable-ossa-modules -nonlib-dependency-scanner
442+
-Xfrontend -enable-ossa-modules
448443
MODULE_DIR "${CMAKE_BINARY_DIR}/lib/swift/embedded"
449444
SDK "embedded"
450445
ARCHITECTURE "${arch}"

0 commit comments

Comments
 (0)