@@ -1720,6 +1720,11 @@ back_deployment_runtime = lit_config.params.get('back_deployment_runtime', None)
1720
1720
if back_deployment_runtime is not None :
1721
1721
config .available_features .add ('back_deployment_runtime' )
1722
1722
1723
+ concurrency_back_deploy_path = ''
1724
+ if run_vendor == 'apple' :
1725
+ if 'back_deploy_concurrency' in config .available_features :
1726
+ 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' , run_os )
1727
+
1723
1728
if 'remote_run_host' in lit_config .params :
1724
1729
if 'remote_run_tmpdir' not in lit_config .params :
1725
1730
lit_config .fatal ("'remote_run_host' provided, but no "
@@ -1773,6 +1778,9 @@ if 'remote_run_host' in lit_config.params:
1773
1778
# FIXME: This could be more principled.
1774
1779
upload_dylibs (os .path .join (test_resource_dir , "clang" , "lib" , "darwin" ))
1775
1780
upload_dylibs (os .path .join (test_resource_dir , "clang" , "lib" , "linux" ))
1781
+ # Only copy when we have use_os_stdlib, otherwise we want to rely on the just-build concurrency
1782
+ if concurrency_back_deploy_path and 'use_os_stdlib' in lit_config .params :
1783
+ upload_dylibs (concurrency_back_deploy_path )
1776
1784
1777
1785
# FIXME: Uploading specific files in bin/ is not very scalable.
1778
1786
local_swift_reflection_test = lit .util .which (
@@ -1983,14 +1991,11 @@ if not kIsWindows:
1983
1991
else :
1984
1992
config .available_features .add ('use_os_stdlib' )
1985
1993
os_stdlib_path = ''
1986
- concurrency_back_deploy_path = ''
1987
1994
if run_vendor == 'apple' :
1988
1995
#If we get swift-in-the-OS for non-Apple platforms, add a condition here
1989
1996
os_stdlib_path = "/usr/lib/swift"
1990
1997
if run_os == 'maccatalyst' :
1991
1998
os_stdlib_path = "/System/iOSSupport/usr/lib/swift:/usr/lib/swift"
1992
- if 'back_deploy_concurrency' in config .available_features :
1993
- 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' , run_os )
1994
1999
1995
2000
all_stdlib_path = os .path .pathsep .join ((os_stdlib_path , concurrency_back_deploy_path , target_stdlib_path ))
1996
2001
0 commit comments