Skip to content

Commit bb2dbfc

Browse files
authored
Merge pull request #41124 from apple/revert-41070-lit-concurreny-runtime-backdeploy
Revert "Correctly detect the ability to use the Swift Concurrency runtime on Darwin platforms"
2 parents 97eb38e + a0ead9e commit bb2dbfc

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

test/lit.cfg

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2011,7 +2011,9 @@ if os.path.exists(static_libswiftCore_path):
20112011

20122012
# Determine whether the concurrency runtime is available.
20132013
if 'concurrency' in config.available_features:
2014-
if run_vendor == 'apple':
2014+
if 'use_os_stdlib' not in lit_config.params:
2015+
config.available_features.add('concurrency_runtime')
2016+
elif run_vendor == 'apple':
20152017
# OS version in which concurrency was introduced
20162018
CONCURRENCY_OS_VERSION = {
20172019
'macosx': '12',
@@ -2032,9 +2034,9 @@ if 'concurrency' in config.available_features:
20322034
}
20332035
concurrency_back_deploy_version = CONCURRENCY_BACK_DEPLOY_VERSION.get(run_os, '')
20342036

2035-
if sw_vers_vers >= concurrency_os_version:
2037+
if run_vers >= concurrency_os_version:
20362038
config.available_features.add('concurrency_runtime')
2037-
elif 'back_deploy_concurrency' in config.available_features and sw_vers_vers >= concurrency_back_deploy_version:
2039+
elif 'back_deploy_concurrency' in config.available_features and run_vers >= concurrency_back_deploy_version:
20382040
config.available_features.add('concurrency_runtime')
20392041
else:
20402042
config.available_features.add('concurrency_runtime')

0 commit comments

Comments
 (0)