Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions test/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,15 @@ if run_vers.endswith('-simulator'):
else:
run_environment=''

# Parse the host triple
(host_cpu, host_vendor, host_os, host_vers) = re.match('([^-]+)-([^-]+)-([^0-9-]+)(.*)', config.host_triple).groups()

if f"{host_cpu}-{host_vendor}-{host_os}" == f"{run_cpu}-{run_vendor}-{run_os}":
# Ignore the version on purpose, to account for scenario
# in which the compiler has a different deployment target
# than the standard library
config.available_features.add('target-same-as-host')

target_arch = run_cpu
if run_os == 'openbsd' and run_cpu == 'amd64':
target_arch = run_cpu
Expand Down Expand Up @@ -581,8 +590,6 @@ else:
config.swift_driver_test_options,
)
)
# Parse the host triple.
(host_cpu, host_vendor, host_os, host_vers) = re.match('([^-]+)-([^-]+)-([^0-9-]+)(.*)', config.host_triple).groups()
toolchain_lib_dir = make_path(config.swift_lib_dir, 'swift', host_os)
config.host_build_swift = (
"%s -target %s -g %s -I %s -L %s %s" % (
Expand Down
1 change: 1 addition & 0 deletions validation-test/BuildSystem/generate_xcode.test
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@

# REQUIRES: standalone_build
# REQUIRES: OS=macosx
# REQUIRES: target-same-as-host