@@ -693,7 +693,7 @@ if (run_os == 'maccatalyst'):
693
693
target_os_abi = 'macosx'
694
694
target_os_is_maccatalyst = "TRUE"
695
695
config .available_features .add ("OS=ios" )
696
- if (run_os in ['linux-gnu' , 'linux-gnueabihf' , 'freebsd' , 'windows-cygnus' , 'windows-gnu' , 'windows-msvc' , 'linux-android' ]):
696
+ if (run_os in ['linux-gnu' , 'linux-gnueabihf' , 'freebsd' , 'windows-cygnus' , 'windows-gnu' , 'windows-msvc' , 'linux-android' , 'linux-androideabi' ]):
697
697
target_mandates_stable_abi = "TRUE"
698
698
config .available_features .add ('swift_only_stable_abi' )
699
699
config .substitutions .append (('%target-os-abi' , target_os_abi ))
@@ -1354,7 +1354,7 @@ elif run_os == 'wasi':
1354
1354
'-target' , config .variant_triple ,
1355
1355
'-Xcc' , '--sysroot=%s' % config .variant_sdk ,
1356
1356
'-Xclang-linker' , '--sysroot=%s' % config .variant_sdk ,
1357
- '-toolchain-stdlib-rpath' , resource_dir_opt ,
1357
+ '-toolchain-stdlib-rpath' , resource_dir_opt ,
1358
1358
mcp_opt , config .swift_test_options ,
1359
1359
config .swift_driver_test_options , swift_execution_tests_extra_flags ])
1360
1360
config .target_codesign = "echo"
@@ -1400,7 +1400,7 @@ elif run_os == 'wasi':
1400
1400
"%s -target %s %s -fobjc-runtime=ios-5.0" %
1401
1401
(config .clang , config .variant_triple , clang_mcp_opt ))
1402
1402
config .target_ld = (
1403
- "%s -L%r" %
1403
+ "%s -L%r" %
1404
1404
(config .wasm_ld , make_path (test_resource_dir , config .target_sdk_name )))
1405
1405
1406
1406
# The Swift interpreter is not available when targeting WebAssembly/WASI.
@@ -1686,7 +1686,7 @@ if not kIsWindows:
1686
1686
"LD_LIBRARY_PATH='{0}:{1}' " # Linux option
1687
1687
"SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
1688
1688
.format (all_stdlib_path , libdispatch_path )) + config .target_run
1689
-
1689
+
1690
1690
if not getattr (config , 'target_run_simple_swift' , None ):
1691
1691
config .target_run_simple_swift_parameterized = SubstituteCaptures (
1692
1692
"%%empty-directory(%%t) && "
0 commit comments