@@ -1440,24 +1440,28 @@ config.substitutions.append(('%module-target-future', target_future))
1440
1440
config .substitutions .append (('%target-sdk-name' , config .target_sdk_name ))
1441
1441
1442
1442
# Add 'stdlib_dir' as the path to the stdlib resource directory
1443
- stdlib_dir = config .swift_lib_dir + "/ swift/"
1444
- if platform .system () == 'Linux' :
1445
- stdlib_dir += config .target_sdk_name + "/" + run_cpu
1443
+ stdlib_dir = os . path . join ( config .swift_lib_dir , " swift" )
1444
+ if platform .system () == 'Linux' or platform . system () == 'Windows' :
1445
+ stdlib_dir = os . path . join ( stdlib_dir , config .target_sdk_name , run_cpu )
1446
1446
else :
1447
- stdlib_dir += config .target_sdk_name
1447
+ stdlib_dir = os . path . join ( stdlib_dir , config .target_sdk_name )
1448
1448
config .substitutions .append (('%stdlib_dir' , stdlib_dir ))
1449
1449
1450
1450
# Add 'stdlib_module' as the path to the stdlib .swiftmodule file
1451
- stdlib_module = stdlib_dir + "/ Swift.swiftmodule"
1451
+ stdlib_module = os . path . join ( stdlib_dir , " Swift.swiftmodule")
1452
1452
if platform .system () == 'Darwin' :
1453
- stdlib_module += "/" + target_specific_module_triple + ".swiftmodule"
1453
+ stdlib_module = os . path . join ( stdlib_module , target_specific_module_triple + ".swiftmodule" )
1454
1454
config .substitutions .append (('%stdlib_module' , stdlib_module ))
1455
+ config .substitutions .append (('%/stdlib_module' ,
1456
+ '/' .join (os .path .normpath (stdlib_module ).split (os .sep ))))
1455
1457
1456
1458
# Add 'ononesupport_module' as the path to the SwiftOnoneSupport .swiftmodule file
1457
- ononesupport_module = stdlib_dir + "/ SwiftOnoneSupport.swiftmodule"
1459
+ ononesupport_module = os . path . join ( stdlib_dir , " SwiftOnoneSupport.swiftmodule")
1458
1460
if platform .system () == 'Darwin' :
1459
- ononesupport_module += "/" + target_specific_module_triple + ".swiftmodule"
1460
- config .substitutions .append (('%ononesupport_module' , ononesupport_module ))
1461
+ ononesupport_module = os .path .join (ononesupport_module , target_specific_module_triple + ".swiftmodule" )
1462
+ config .substitutions .append (('%ononesupport_module' , ononesupport_module ))
1463
+ config .substitutions .append (('%/ononesupport_module' ,
1464
+ '/' .join (os .path .normpath (ononesupport_module ).split (os .sep ))))
1461
1465
1462
1466
# Different OS's require different prefixes for the environment variables to be
1463
1467
# propagated to the calling contexts.
0 commit comments