Skip to content

lit.cfg: fix a bug in simulator target #24010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2019
Merged

lit.cfg: fix a bug in simulator target #24010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,8 @@ def use_interpreter_for_simple_runs():

target_specific_module_triple = config.variant_triple

config.target_run = ""

if run_vendor == 'apple':
target_specific_module_triple = '{}-apple-{}'.format(
{ 'aarch64': 'arm64', 'amd64': 'x86_64' }.get(run_cpu, run_cpu),
Expand Down Expand Up @@ -1356,7 +1358,8 @@ if not kIsWindows:
"/usr/bin/env "
"DYLD_LIBRARY_PATH='{0}' " # Apple option
"LD_LIBRARY_PATH='{0}' " # Linux option
.format(target_stdlib_path))
"SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
.format(target_stdlib_path)) + config.target_run
else:
os_stdlib_path = ''
if run_vendor == 'apple':
Expand All @@ -1368,7 +1371,8 @@ if not kIsWindows:
"/usr/bin/env "
"DYLD_LIBRARY_PATH='{0}' " # Apple option
"LD_LIBRARY_PATH='{0}' " # Linux option
.format(all_stdlib_path))
"SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
.format(all_stdlib_path)) + config.target_run

#
# When changing substitutions, update docs/Testing.rst.
Expand Down