Skip to content

Commit 887857f

Browse files
committed
[build-script] Remove hard-coded install prefix of /usr and pass it in instead
1 parent 7251727 commit 887857f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build-script.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def get_installed_dylib_name():
258258

259259

260260
def get_swiftpm_invocation(toolchain, action, build_dir, multiroot_data_file, release):
261-
swift_exec = os.path.join(toolchain, "usr", "bin", "swift")
261+
swift_exec = os.path.join(toolchain, "bin", "swift")
262262

263263
swiftpm_call = [swift_exec, action]
264264
swiftpm_call.extend(["--package-path", PACKAGE_DIR])
@@ -689,7 +689,7 @@ def main():
689689
else:
690690
# will this ever happen?
691691
build_dir = os.path.join(args.build_dir, "debug")
692-
stdlib_rpath = os.path.join(args.toolchain, "usr", "lib", "swift", "macosx")
692+
stdlib_rpath = os.path.join(args.toolchain, "lib", "swift", "macosx")
693693
install(
694694
build_dir=build_dir,
695695
dylib_dir=args.dylib_dir,

0 commit comments

Comments
 (0)