Skip to content

Commit 1f1ceb4

Browse files
committed
[cmake] Do not override existing JOB_POOLS.
When building Swift as part of an LLVM distribution the global property JOB_POOLS would have been overriden by Swift. If one wanted parallel linking in LLVM, the job pools setup by LLVM would have disappered. This didn't happen in the standalone builds, because HandleLLVMOptions is included in that case _after_ the JOB_POOLS property would have been initialized without APPEND.
1 parent d5c28d8 commit 1f1ceb4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ else()
2020
# Make a job pool for things that can't yet be distributed
2121
cmake_host_system_information(
2222
RESULT localhost_logical_cores QUERY NUMBER_OF_LOGICAL_CORES)
23-
set_property(GLOBAL PROPERTY JOB_POOLS local_jobs=${localhost_logical_cores})
23+
set_property(GLOBAL APPEND PROPERTY JOB_POOLS local_jobs=${localhost_logical_cores})
2424
# Put linking in that category
2525
set(CMAKE_JOB_POOL_LINK local_jobs)
2626
endif()

0 commit comments

Comments
 (0)