Skip to content

Commit fd8a3aa

Browse files
committed
Add cross compile toolchain support to Benchmarks, and fix the python lint issue in skstresstester.py
1 parent f4dea1a commit fd8a3aa

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

utils/swift_build_support/swift_build_support/products/benchmarks.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ def get_dependencies(cls):
8282

8383

8484
def run_build_script_helper(host_target, product, args):
85-
toolchain_path = args.install_destdir
85+
toolchain_path = swiftpm.SwiftPM.get_install_destdir(args,
86+
host_target,
87+
product.build_dir)
8688
if platform.system() == 'Darwin':
8789
# The prefix is an absolute path, so concatenate without os.path.
8890
toolchain_path += \

utils/swift_build_support/swift_build_support/products/skstresstester.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ def should_install(self, host_target):
9696
return self.args.install_skstresstester
9797

9898
def install(self, host_target):
99-
install_destdir = swiftpm.SwiftPM.get_install_destdir(self.args, host_target, self.build_dir)
99+
install_destdir = swiftpm.SwiftPM.get_install_destdir(self.args,
100+
host_target,
101+
self.build_dir)
100102
install_prefix = install_destdir + self.args.install_prefix
101103
self.run_build_script_helper('install', host_target, [
102104
'--prefix', install_prefix

0 commit comments

Comments
 (0)