Skip to content

Commit 7c97325

Browse files
Joe Shajrawimikeash
authored andcommitted
lit.cfg: fix a bug in simulator target
1 parent 30ab320 commit 7c97325

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

test/lit.cfg

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,10 @@ def use_interpreter_for_simple_runs():
605605
config.target_run_simple_swift = make_simple_target_run()
606606
config.available_features.add('interpret')
607607

608+
target_specific_module_triple = config.variant_triple
609+
610+
config.target_run = ""
611+
608612
if run_vendor == 'apple':
609613
config.available_features.add('objc_interop')
610614
config.target_object_format = "macho"
@@ -1193,7 +1197,8 @@ if not kIsWindows:
11931197
"/usr/bin/env "
11941198
"DYLD_LIBRARY_PATH='{0}' " # Apple option
11951199
"LD_LIBRARY_PATH='{0}' " # Linux option
1196-
.format(target_stdlib_path))
1200+
"SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
1201+
.format(target_stdlib_path)) + config.target_run
11971202
else:
11981203
os_stdlib_path = ''
11991204
if run_vendor == 'apple':
@@ -1205,7 +1210,8 @@ if not kIsWindows:
12051210
"/usr/bin/env "
12061211
"DYLD_LIBRARY_PATH='{0}' " # Apple option
12071212
"LD_LIBRARY_PATH='{0}' " # Linux option
1208-
.format(all_stdlib_path))
1213+
"SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
1214+
.format(all_stdlib_path)) + config.target_run
12091215

12101216
#
12111217
# When changing substitutions, update docs/Testing.rst.

0 commit comments

Comments
 (0)