Skip to content

Commit e96fc88

Browse files
authored
Merge pull request #77541 from artemcm/AddSwiftScanDepToEmbeddedStdLib
[CMake] Add a dependency on 'libSwiftScan' for 'swiftCore'
2 parents 1e6effd + 58709e5 commit e96fc88

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

stdlib/public/Platform/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
8383

8484
add_custom_target(embedded-darwin)
8585
add_dependencies(embedded-libraries embedded-darwin)
86-
87-
set_property(GLOBAL APPEND PROPERTY JOB_POOLS one_job=1)
8886
foreach(entry ${EMBEDDED_STDLIB_TARGET_TRIPLES})
8987
string(REGEX REPLACE "[ \t]+" ";" list "${entry}")
9088
list(GET list 0 arch)
@@ -127,7 +125,6 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
127125
INSTALL_IN_COMPONENT stdlib
128126
)
129127
add_dependencies(embedded-darwin embedded-darwin-${mod})
130-
set_property(TARGET embedded-darwin-${mod} PROPERTY JOB_POOL_COMPILE one_job)
131128
endforeach()
132129
endif()
133130

stdlib/public/core/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,18 @@ 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+
406411
add_swift_target_library(swiftCore
407412
${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
408413
${swiftCore_common_options}
409414
${compile_flags_for_final_build}
410415
FILE_DEPENDS
411416
${swiftCore_common_dependencies}
417+
DEPENDS ${tooling_stdlib_deps}
412418
INSTALL_IN_COMPONENT
413419
stdlib
414420
MACCATALYST_BUILD_FLAVOR
@@ -451,6 +457,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
451457
SDK "embedded"
452458
ARCHITECTURE "${arch}"
453459
FILE_DEPENDS ${swiftCore_common_dependencies}
460+
DEPENDS ${tooling_stdlib_deps}
454461
INSTALL_IN_COMPONENT stdlib
455462
)
456463
add_dependencies(embedded-stdlib embedded-stdlib-${mod})

0 commit comments

Comments
 (0)