Skip to content

[Bootstrap] Add an extra argument to set a library path. #9118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: release/6.2
Choose a base branch
from
+17 −1
Draft

[Bootstrap] Add an extra argument to set a library path. #9118

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
695b961
[Bootstrap] Add an extra argument to set a library path.
al45tair Sep 10, 2025
723b7c8
[Bootstrap] Fix typo.
al45tair Sep 10, 2025
65287dd
[Bootstrap] Force-enable the backtracer.
al45tair Sep 29, 2025
6a2b600
[Bootstrap] Set `(DY)LD_LIBRARY_PATH` even if not bootstrapping.
al45tair Oct 1, 2025
a3c36da
[Bootstrap] Also set `DYLD_INSERT_LIBRARIES`.
al45tair Oct 14, 2025
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
18 changes: 17 additions & 1 deletion Utilities/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ def add_build_args(parser):
"--llbuild-link-framework",
action="store_true",
help="whether to link to the llbuild framework")
parser.add_argument(
"--extra-dynamic-library-path",
help="path to add to DYLD/LD_LIBRARY_PATH")
parser.add_argument(
"--release",
action="store_true",
Expand Down Expand Up @@ -876,8 +879,9 @@ def get_swiftpm_env_cmd(args):
if not '-macosx' in args.build_target and args.command == 'install':
env_cmd.append("SWIFTCI_INSTALL_RPATH_OS=%s" % args.platform_path.group(2))

libs = []
if args.bootstrap:
libs = [
libs += [
os.path.join(args.bootstrap_dir, "lib"),
os.path.join(args.build_dirs["tsc"], "lib"),
os.path.join(args.build_dirs["llbuild"], "lib"),
Expand All @@ -891,7 +895,18 @@ def get_swiftpm_env_cmd(args):
os.path.join(args.build_dirs["swift-build"], "lib"),
]

if args.extra_dynamic_library_path:
libs.append(args.extra_dynamic_library_path)

if libs:
if platform.system() == 'Darwin':
# This DYLD_INSERT_LIBRARIES command is necessary to prevent problems
# with dyld failing to realise that the newly built libswiftCore is
# the replacement for the system version.
#
# (This is caused by the install name in the newly built version
# using an `@rpath`.)
env_cmd.append("DYLD_INSERT_LIBRARIES=/usr/lib/swift/libswiftCore.dylib")
env_cmd.append("DYLD_LIBRARY_PATH=%s" % ":".join(libs))
else:
libs_joined = ":".join(libs + args.target_info["paths"]["runtimeLibraryPaths"])
Expand All @@ -901,6 +916,7 @@ def get_swiftpm_env_cmd(args):
env_cmd.append("SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS=YES")

env_cmd += [
"SWIFT_BACKTRACE=enable=yes,warnings=suppressed",
"SWIFT_EXEC=" + args.swiftc_path,
"SWIFT_DRIVER_SWIFT_EXEC=" + args.swiftc_path,
"CC=" + args.clang_path,
Expand Down