Skip to content

Commit 016e55b

Browse files
authored
Merge pull request #83530 from edymtt/edymtt/copy-back-deploy-concurrency-from-xcode
lit.cfg: copy back deployed concurrency library from Xcode
2 parents 9d9c9f0 + 556bd5f commit 016e55b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

test/lit.cfg

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2304,7 +2304,10 @@ concurrency_back_deploy_path = ''
23042304
if run_vendor == 'apple':
23052305
if 'back_deploy_concurrency' in lit_config.params:
23062306
config.available_features.add('back_deploy_concurrency')
2307-
concurrency_back_deploy_path = os.path.join(os.path.dirname(swift_obj_root), os.path.basename(swift_obj_root).replace("swift-", "backdeployconcurrency-"), 'lib', 'swift-5.5', xcrun_sdk_name)
2307+
toolchain_swiftc_path = subprocess.check_output(['xcrun', '--find', 'swiftc']).rstrip().decode('utf-8')
2308+
concurrency_back_deploy_path = os.path.join(os.path.dirname(toolchain_swiftc_path), '..', 'lib', 'swift-5.5', xcrun_sdk_name)
2309+
if not os.path.isdir(concurrency_back_deploy_path):
2310+
lit_config.fatal(f"Concurrency back deploy libraries not found at {concurrency_back_deploy_path}")
23082311

23092312
backtracer_path = make_path(config.swift_libexec_dir, 'swift',
23102313
config.target_sdk_name, 'swift-backtrace')

0 commit comments

Comments
 (0)