Skip to content

Commit 97eb38e

Browse files
authored
Merge pull request swiftlang#41070 from DougGregor/lit-concurreny-runtime-backdeploy
2 parents 56a614a + d0819be commit 97eb38e

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

test/lit.cfg

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2011,9 +2011,7 @@ 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 'use_os_stdlib' not in lit_config.params:
2015-
config.available_features.add('concurrency_runtime')
2016-
elif run_vendor == 'apple':
2014+
if run_vendor == 'apple':
20172015
# OS version in which concurrency was introduced
20182016
CONCURRENCY_OS_VERSION = {
20192017
'macosx': '12',
@@ -2034,9 +2032,9 @@ if 'concurrency' in config.available_features:
20342032
}
20352033
concurrency_back_deploy_version = CONCURRENCY_BACK_DEPLOY_VERSION.get(run_os, '')
20362034

2037-
if run_vers >= concurrency_os_version:
2035+
if sw_vers_vers >= concurrency_os_version:
20382036
config.available_features.add('concurrency_runtime')
2039-
elif 'back_deploy_concurrency' in config.available_features and run_vers >= concurrency_back_deploy_version:
2037+
elif 'back_deploy_concurrency' in config.available_features and sw_vers_vers >= concurrency_back_deploy_version:
20402038
config.available_features.add('concurrency_runtime')
20412039
else:
20422040
config.available_features.add('concurrency_runtime')

0 commit comments

Comments
 (0)