@@ -1178,48 +1178,6 @@ if sftp_server_path:
1178
1178
config .substitutions .append (('%sftp-server' ,
1179
1179
sftp_server_path or 'no-sftp-server' ))
1180
1180
1181
-
1182
- if not getattr (config , 'target_run_simple_swift' , None ):
1183
- config .target_run_simple_swift_parameterized = \
1184
- (SubstituteCaptures ('%%empty-directory(%%t) && '
1185
- '%s %s %%s \\ 1 -o %%t/a.out -module-name main -Xfrontend -verify-sil-ownership && '
1186
- '%s %%t/a.out &&'
1187
- '%s %%t/a.out' % (config .target_build_swift ,
1188
- mcp_opt , config .target_codesign ,
1189
- config .target_run )))
1190
- config .target_run_simple_swift = (
1191
- '%%empty-directory(%%t) && '
1192
- '%s %s %%s -o %%t/a.out -module-name main -Xfrontend -verify-sil-ownership && '
1193
- '%s %%t/a.out &&'
1194
- '%s %%t/a.out'
1195
- % (config .target_build_swift , mcp_opt , config .target_codesign , config .target_run ))
1196
- config .target_run_stdlib_swift = (
1197
- '%%empty-directory(%%t) && '
1198
- '%s %s %%s -o %%t/a.out -module-name main '
1199
- '-Xfrontend -disable-access-control -Xfrontend -verify-sil-ownership && '
1200
- '%s %%t/a.out &&'
1201
- '%s %%t/a.out'
1202
- % (config .target_build_swift , mcp_opt , config .target_codesign , config .target_run ))
1203
- config .target_run_simple_swiftgyb = (
1204
- '%%empty-directory(%%t) && '
1205
- '%%gyb %%s -o %%t/main.swift && '
1206
- '%%line-directive %%t/main.swift -- '
1207
- '%s %s %%t/main.swift -o %%t/a.out -module-name main -Xfrontend -verify-sil-ownership && '
1208
- '%s %%t/a.out &&'
1209
- '%%line-directive %%t/main.swift -- '
1210
- '%s %%t/a.out'
1211
- % (config .target_build_swift , mcp_opt , config .target_codesign , config .target_run ))
1212
- config .target_run_stdlib_swiftgyb = (
1213
- '%%empty-directory(%%t) && '
1214
- '%%gyb %%s -o %%t/main.swift && '
1215
- '%%line-directive %%t/main.swift -- '
1216
- '%s %s %%t/main.swift -o %%t/a.out -module-name main '
1217
- '-Xfrontend -disable-access-control -Xfrontend -verify-sil-ownership && '
1218
- '%s %%t/a.out &&'
1219
- '%%line-directive %%t/main.swift -- '
1220
- '%s %%t/a.out'
1221
- % (config .target_build_swift , mcp_opt , config .target_codesign , config .target_run ))
1222
-
1223
1181
subst_target_jit_run = ""
1224
1182
if 'swift_interpreter' in config .available_features :
1225
1183
subst_target_jit_run = (
@@ -1309,6 +1267,47 @@ if not kIsWindows:
1309
1267
"LD_LIBRARY_PATH='{0}' " # Linux option
1310
1268
"SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
1311
1269
.format (all_stdlib_path )) + config .target_run
1270
+
1271
+ if not getattr (config , 'target_run_simple_swift' , None ):
1272
+ config .target_run_simple_swift_parameterized = \
1273
+ (SubstituteCaptures ('%%empty-directory(%%t) && '
1274
+ '%s %s %%s \\ 1 -o %%t/a.out -module-name main && '
1275
+ '%s %%t/a.out &&'
1276
+ '%s %%t/a.out' % (config .target_build_swift ,
1277
+ mcp_opt , config .target_codesign ,
1278
+ config .target_run )))
1279
+ config .target_run_simple_swift = (
1280
+ '%%empty-directory(%%t) && '
1281
+ '%s %s %%s -o %%t/a.out -module-name main && '
1282
+ '%s %%t/a.out &&'
1283
+ '%s %%t/a.out'
1284
+ % (config .target_build_swift , mcp_opt , config .target_codesign , config .target_run ))
1285
+ config .target_run_stdlib_swift = (
1286
+ '%%empty-directory(%%t) && '
1287
+ '%s %s %%s -o %%t/a.out -module-name main '
1288
+ '-Xfrontend -disable-access-control && '
1289
+ '%s %%t/a.out &&'
1290
+ '%s %%t/a.out'
1291
+ % (config .target_build_swift , mcp_opt , config .target_codesign , config .target_run ))
1292
+ config .target_run_simple_swiftgyb = (
1293
+ '%%empty-directory(%%t) && '
1294
+ '%%gyb %%s -o %%t/main.swift && '
1295
+ '%%line-directive %%t/main.swift -- '
1296
+ '%s %s %%t/main.swift -o %%t/a.out -module-name main && '
1297
+ '%s %%t/a.out &&'
1298
+ '%%line-directive %%t/main.swift -- '
1299
+ '%s %%t/a.out'
1300
+ % (config .target_build_swift , mcp_opt , config .target_codesign , config .target_run ))
1301
+ config .target_run_stdlib_swiftgyb = (
1302
+ '%%empty-directory(%%t) && '
1303
+ '%%gyb %%s -o %%t/main.swift && '
1304
+ '%%line-directive %%t/main.swift -- '
1305
+ '%s %s %%t/main.swift -o %%t/a.out -module-name main '
1306
+ '-Xfrontend -disable-access-control && '
1307
+ '%s %%t/a.out &&'
1308
+ '%%line-directive %%t/main.swift -- '
1309
+ '%s %%t/a.out'
1310
+ % (config .target_build_swift , mcp_opt , config .target_codesign , config .target_run ))
1312
1311
1313
1312
#
1314
1313
# When changing substitutions, update docs/Testing.rst.
0 commit comments