Skip to content

Commit ac7c176

Browse files
committed
[CMake] Establish a dependency from standard library variants onto 'libSwiftScan'
Now that the 'libSwiftScan' target is configured as part of 'tooling-libraries' instead of 'tools', we can establish a dependency link on it to ensure that the just-built compiler used to compile the standard-library sources can rely on the dependency scanner shared library having been built.
1 parent 8ce8af4 commit ac7c176

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,6 +1471,7 @@ if(SWIFT_ENABLE_DISPATCH)
14711471
endif()
14721472

14731473
# Add all of the subdirectories, where we actually do work.
1474+
add_subdirectory(tooling-libraries)
14741475

14751476
###############
14761477
# PLEASE READ #

stdlib/public/core/CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -403,18 +403,14 @@ if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")
403403
BOOTSTRAPPING 1)
404404
endif()
405405

406-
set(tooling_stdlib_deps)
407-
if(TARGET libSwiftScan)
408-
list(append tooling_stdlib_deps libSwiftScan)
409-
endif()
410-
411406
add_swift_target_library(swiftCore
412407
${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
413408
${swiftCore_common_options}
414409
${compile_flags_for_final_build}
415410
FILE_DEPENDS
416411
${swiftCore_common_dependencies}
417-
DEPENDS ${tooling_stdlib_deps}
412+
DEPENDS
413+
libSwiftScan
418414
INSTALL_IN_COMPONENT
419415
stdlib
420416
MACCATALYST_BUILD_FLAVOR
@@ -457,7 +453,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
457453
SDK "embedded"
458454
ARCHITECTURE "${arch}"
459455
FILE_DEPENDS ${swiftCore_common_dependencies}
460-
DEPENDS ${tooling_stdlib_deps}
456+
DEPENDS libSwiftScan
461457
INSTALL_IN_COMPONENT stdlib
462458
)
463459
add_dependencies(embedded-stdlib embedded-stdlib-${mod})

0 commit comments

Comments
 (0)