Skip to content

Commit 5668ffb

Browse files
committed
[new-bootstrap] Add rpath when using llbuild.framework
1 parent 0c2e0e3 commit 5668ffb

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

Utilities/new-bootstrap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,11 @@ def build_swiftpm_with_swiftpm(args):
412412

413413
lib_dir = os.path.join(args.target_dir, "lib", "swift")
414414
mkdir_p(lib_dir)
415+
416+
# Remove old cruft.
417+
if os.path.isdir(lib_dir):
418+
shutil.rmtree(lib_dir)
419+
415420
symlink_force(os.path.join(args.bootstrap_dir, "pm"), os.path.join(lib_dir, "pm"))
416421

417422
def call_swiftpm(args, cmd):
@@ -486,6 +491,8 @@ def get_swiftpm_flags(args):
486491
build_flags.extend([
487492
"-Xswiftc", "-F" + args.llbuild_build_dir,
488493
"-Xlinker", "-F" + args.llbuild_build_dir,
494+
"-Xlinker", "-rpath",
495+
"-Xlinker", "@executable_path/../../../../../SharedFrameworks",
489496
])
490497

491498
return build_flags

0 commit comments

Comments
 (0)