@@ -1329,7 +1329,9 @@ if run_vendor == 'apple':
1329
1329
"-Xlinker -headerpad_max_install_names " +
1330
1330
"-Xlinker -rpath -Xlinker /usr/lib/swift %s " )%
1331
1331
(xcrun_prefix , config .swiftc , target_options , config .swift_driver_test_options ))
1332
+ print (f"Set target_swiftc_driver in apple block to '{ config .target_swiftc_driver } '" )
1332
1333
config .swiftc_driver_stdlib_target = config .target_swiftc_driver
1334
+ print (f"Set swiftc_driver_stdlib_target in apple block to '{ config .swiftc_driver_stdlib_target } '" )
1333
1335
config .target_clang = (
1334
1336
"%s %s %s" %
1335
1337
(xcrun_prefix , config .clangxx , config .target_cc_options ))
@@ -1468,10 +1470,12 @@ elif run_os in ['windows-msvc']:
1468
1470
config .resource_dir_opt , mcp_opt , \
1469
1471
config .swift_system_overlay_opt , \
1470
1472
config .swift_driver_test_options ))
1473
+ print (f"Set target_swiftc_driver in windows block to '{ config .target_swiftc_driver } '" )
1471
1474
config .swiftc_driver_stdlib_target = \
1472
1475
('%r -target %s %s %s %s' % (config .swiftc , config .variant_triple , \
1473
1476
config .resource_dir_opt , mcp_opt , \
1474
1477
config .swift_driver_test_options ))
1478
+ print (f"Set swiftc_driver_stdlib_target in windows block to '{ config .swiftc_driver_stdlib_target } '" )
1475
1479
config .target_swift_modulewrap = \
1476
1480
('%r -modulewrap -target %s' % (config .swiftc , config .variant_triple ))
1477
1481
config .target_swift_emit_pcm = \
@@ -1599,7 +1603,9 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
1599
1603
config .target_swiftc_driver = (
1600
1604
"%s -target %s -toolchain-stdlib-rpath %s %s %s" %
1601
1605
(config .swiftc , config .variant_triple , config .resource_dir_opt , mcp_opt , config .swift_driver_test_options ))
1606
+ print (f"Set target_swiftc_driver in linux block to '{ config .target_swiftc_driver } '" )
1602
1607
config .swiftc_driver_stdlib_target = config .target_swiftc_driver
1608
+ print (f"Set swiftc_driver_stdlib_target in linux block to '{ config .swiftc_driver_stdlib_target } '" )
1603
1609
config .target_swift_modulewrap = (
1604
1610
'%s -modulewrap -target %s' %
1605
1611
(config .swiftc , config .variant_triple ))
@@ -1718,7 +1724,9 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
1718
1724
'-tools-directory' , tools_directory ,
1719
1725
config .resource_dir_opt , mcp_opt ,
1720
1726
config .swift_driver_test_options ])
1727
+ print (f"Set target_swiftc_driver in android block to '{ config .target_swiftc_driver } '" )
1721
1728
config .swiftc_driver_stdlib_target = config .target_swiftc_driver
1729
+ print (f"Set swiftc_driver_stdlib_target in android block to '{ config .swiftc_driver_stdlib_target } '" )
1722
1730
config .target_swift_modulewrap = ' ' .join ([
1723
1731
config .swiftc , '-modulewrap' ,
1724
1732
'-target' , config .variant_triple ])
@@ -1786,7 +1794,9 @@ elif run_os == 'wasi':
1786
1794
config .target_swiftc_driver = (
1787
1795
"%s -target %s -toolchain-stdlib-rpath %s %s" %
1788
1796
(config .swiftc , config .variant_triple , config .resource_dir_opt , mcp_opt ))
1797
+ print (f"Set target_swiftc_driver in wasi block to '{ config .target_swiftc_driver } '" )
1789
1798
config .swiftc_driver_stdlib_target = config .target_swiftc_driver
1799
+ print (f"Set swiftc_driver_stdlib_target in wasi block to '{ config .swiftc_driver_stdlib_target } '" )
1790
1800
config .target_swift_modulewrap = (
1791
1801
'%s -modulewrap -target %s' %
1792
1802
(config .swiftc , config .variant_triple ))
@@ -2504,7 +2514,9 @@ config.substitutions.append(('%target-swift-reflection-test', config.target_swif
2504
2514
2505
2515
config .substitutions .append (('%target-swift-reflection-dump' , '{} {} {}' .format (config .swift_reflection_dump , '-arch' , run_cpu )))
2506
2516
config .substitutions .append (('%target-swiftc_driver' , config .target_swiftc_driver ))
2517
+ print (f"Substituting target-swiftc_driver for '{ config .target_swiftc_driver } '" )
2507
2518
config .substitutions .append (('%swiftc_driver-stdlib-target' , config .swiftc_driver_stdlib_target ))
2519
+ print (f"Substituting swiftc_driver-stdlib-target for '{ config .swiftc_driver_stdlib_target } '" )
2508
2520
2509
2521
config .substitutions .append (('%target-swift-remoteast-test-with-sdk' ,
2510
2522
'%s %s -sdk %r' %
0 commit comments