Skip to content

Commit d8a40a1

Browse files
committed
build: use the correct install location
Use the correct installation location path computation `toolchain_install_path` rather than trying to compute it ourselves. This ensures that the files are installed into the right location.
1 parent 10803c0 commit d8a40a1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

utils/swift_build_support/swift_build_support/products/pythonkit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def build(self, host_target):
5353
'-G', 'Ninja',
5454
'-D', 'BUILD_SHARED_LIBS=YES',
5555
'-D', 'CMAKE_INSTALL_PREFIX={}/usr'.format(
56-
self.args.install_destdir),
56+
self.install_toolchain_path()),
5757
'-D', 'CMAKE_MAKE_PROGRAM={}'.format(self.toolchain.ninja),
5858
'-D', 'CMAKE_Swift_COMPILER={}'.format(swiftc),
5959
'-B', self.build_dir,

utils/swift_build_support/swift_build_support/products/tensorflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def build(self, host_target):
5353
'-G', 'Ninja',
5454
'-D', 'BUILD_SHARED_LIBS=YES',
5555
'-D', 'CMAKE_INSTALL_PREFIX={}/usr'.format(
56-
self.args.install_destdir),
56+
self.install_toolchain_path()),
5757
'-D', 'CMAKE_MAKE_PROGRAM={}'.format(self.toolchain.ninja),
5858
'-D', 'CMAKE_Swift_COMPILER={}'.format(swiftc),
5959
'-B', self.build_dir,

0 commit comments

Comments
 (0)