Skip to content

Commit 19dba09

Browse files
committed
[Build] Disable Concurrency if the deployment version is too low.
For the new runtime build only (and only when triggered from the old build system), turn Concurrency off if the deployment target is less than 10.15.
1 parent 3114657 commit 19dba09

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1640,6 +1640,12 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
16401640
set(stdlib_deployment_version_flag -DCMAKE_OSX_DEPLOYMENT_TARGET=${SWIFT_SDK_${sdk}_DEPLOYMENT_VERSION})
16411641
endif()
16421642

1643+
if(sdk STREQUAL "OSX" AND SWIFT_SDK_${sdk}_DEPLOYMENT_VERSION VERSION_LESS "10.15")
1644+
set(build_concurrency NO)
1645+
else()
1646+
set(build_concurrency YES)
1647+
endif()
1648+
16431649
ExternalProject_Add("${stdlib_target}-core"
16441650
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Runtimes/Core"
16451651
# TODO: Add this once we're ready to start swapping out the libraries
@@ -1665,7 +1671,7 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
16651671
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
16661672
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
16671673
-DSwiftCore_INSTALL_NESTED_SUBDIR=YES
1668-
-DSwiftCore_ENABLE_CONCURRENCY=YES)
1674+
-DSwiftCore_ENABLE_CONCURRENCY=${build_concurrency})
16691675
if(NOT ${CMAKE_CROSSCOMPILING})
16701676
add_dependencies("${stdlib_target}-core" swift-frontend)
16711677
endif()

0 commit comments

Comments
 (0)