Repository navigation
fix(bootstrap/darwin): fix rpath for distributed LLD - #163954
Merged
Merged
Conversation
rami3l
force-pushed
the
fix/bootstrap-darwin-lld
branch
from
October 7, 2026 17:05
c260a22 to
271295a
Compare
Member
Author
VerificationVerified manually via the following sequence: Before> otool -l build/aarch64-apple-darwin/stage2/lib/rustlib/aarch64-apple-darwin/bin/rust-lld | 'grep' -A3 LC_RPATH
cmd LC_RPATH
cmdsize 32
path @loader_path/../lib (offset 12)
Load command 18
cmd LC_RPATH
cmdsize 80
path /Users/runner/work/rust/rust/build/aarch64-apple-darwin/llvm/lib (offset 12)
Load command 19
> ls -lh build/host/stage2/lib/libLLVM.dylib
-rw-r--r-- 7 rami3l staff 137M Oct 3 22:27 build/host/stage2/lib/libLLVM.dylibAfter> ./x.py build --stage 2 compiler/rustc
[..]
> otool -l build/aarch64-apple-darwin/stage2/lib/rustlib/aarch64-apple-darwin/bin/rust-lld | 'grep' -A3 LC_RPATH
cmd LC_RPATH
cmdsize 40
path @loader_path/../../../ (offset 12)
Load command 19
cmd LC_RPATH
cmdsize 32
path @loader_path/../lib (offset 12)
Load command 20
cmd LC_RPATH
cmdsize 88
path [local]/rust/build/aarch64-apple-darwin/llvm/lib (offset 12)
Load command 21As such, I think this PR can be considered ready for review. For the possibility of writing a regression test about it, I consulted @Kobzol and his conclusion was that that may be too much for this small fix. |
rami3l
marked this pull request as ready for review
October 8, 2026 13:22
Collaborator
|
This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp. |
Collaborator
|
r? @clubby789 rustbot has assigned @clubby789. Use Why was this reviewer chosen?The reviewer was selected based on:
|
rami3l
force-pushed
the
fix/bootstrap-darwin-lld
branch
from
October 8, 2026 13:25
271295a to
7b151cf
Compare
Member
Author
Collaborator
|
|
Member
|
@bors r+ |
Contributor
Member
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Oct 9, 2026
…=Kobzol fix(bootstrap/darwin): fix rpath for distributed LLD Closes rust-lang#163947 by mirroring the existing rpath tweak for linux on darwin. ## Concerns - [ ] Is there an easy way to reliably test the effect of this fix (there doesn't seem to be dist tests for darwin in particular)? I'd love to add one if possible.
rust-bors Bot
pushed a commit
that referenced
this pull request
Oct 9, 2026
…uwer Rollup of 7 pull requests Successful merges: - #162652 (Syntactically reject leading parenthesized precise capturing lists in bare trait object types (`(use<…>)+`)) - #163337 (MIR move elimination [3/6]: PreciseLiveness) - #163954 (fix(bootstrap/darwin): fix rpath for distributed LLD) - #163956 (Pass the unremapped path to the `rustc` invocation for doctests) - #163634 (move overflow lint computation into decorator) - #163727 (rigid aliases to non-rigid for fully normalized check) - #163745 (replace `fully_monomorphized` with `cx.typing_env()`)
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Oct 9, 2026
…=Kobzol fix(bootstrap/darwin): fix rpath for distributed LLD Closes rust-lang#163947 by mirroring the existing rpath tweak for linux on darwin. ## Concerns - [ ] Is there an easy way to reliably test the effect of this fix (there doesn't seem to be dist tests for darwin in particular)? I'd love to add one if possible.
rust-bors Bot
pushed a commit
that referenced
this pull request
Oct 9, 2026
…uwer Rollup of 11 pull requests Successful merges: - #162652 (Syntactically reject leading parenthesized precise capturing lists in bare trait object types (`(use<…>)+`)) - #163337 (MIR move elimination [3/6]: PreciseLiveness) - #163954 (fix(bootstrap/darwin): fix rpath for distributed LLD) - #163956 (Pass the unremapped path to the `rustc` invocation for doctests) - #163634 (move overflow lint computation into decorator) - #163666 (Updates the expect message library/core/src/time.rs) - #163727 (rigid aliases to non-rigid for fully normalized check) - #163745 (replace `fully_monomorphized` with `cx.typing_env()`) - #164000 (When mentioning that closure doesn't implement trait, point at closure) - #164007 ([rustdoc] Prefer local paths over remote ones when foreign item is locally reexported) - #164017 (cg_llvm: Avoid some explicit casts to `*const c_char`)
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Oct 9, 2026
…=Kobzol fix(bootstrap/darwin): fix rpath for distributed LLD Closes rust-lang#163947 by mirroring the existing rpath tweak for linux on darwin. ## Concerns - [ ] Is there an easy way to reliably test the effect of this fix (there doesn't seem to be dist tests for darwin in particular)? I'd love to add one if possible.
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Oct 9, 2026
…=Kobzol fix(bootstrap/darwin): fix rpath for distributed LLD Closes rust-lang#163947 by mirroring the existing rpath tweak for linux on darwin. ## Concerns - [ ] Is there an easy way to reliably test the effect of this fix (there doesn't seem to be dist tests for darwin in particular)? I'd love to add one if possible.
rust-bors Bot
pushed a commit
that referenced
this pull request
Oct 9, 2026
…uwer Rollup of 14 pull requests Successful merges: - #162652 (Syntactically reject leading parenthesized precise capturing lists in bare trait object types (`(use<…>)+`)) - #163337 (MIR move elimination [3/6]: PreciseLiveness) - #163954 (fix(bootstrap/darwin): fix rpath for distributed LLD) - #163193 (cfi: mangle `f128` as `e` rather than `g` on platforms without `_Float128`) - #163634 (move overflow lint computation into decorator) - #163666 (Updates the expect message library/core/src/time.rs) - #163727 (rigid aliases to non-rigid for fully normalized check) - #163745 (replace `fully_monomorphized` with `cx.typing_env()`) - #163912 (Fix debug assert failure in `note_obligation_cause_code_inner`) - #163972 (const-eval: ICE when we hit a non-const fn) - #164000 (When mentioning that closure doesn't implement trait, point at closure) - #164007 ([rustdoc] Prefer local paths over remote ones when foreign item is locally reexported) - #164017 (cg_llvm: Avoid some explicit casts to `*const c_char`) - #164025 (Less `CanonicalVarValues`)
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Oct 9, 2026
…=Kobzol fix(bootstrap/darwin): fix rpath for distributed LLD Closes rust-lang#163947 by mirroring the existing rpath tweak for linux on darwin. ## Concerns - [ ] Is there an easy way to reliably test the effect of this fix (there doesn't seem to be dist tests for darwin in particular)? I'd love to add one if possible.
rust-bors Bot
pushed a commit
that referenced
this pull request
Oct 9, 2026
…uwer Rollup of 14 pull requests Successful merges: - #162652 (Syntactically reject leading parenthesized precise capturing lists in bare trait object types (`(use<…>)+`)) - #163337 (MIR move elimination [3/6]: PreciseLiveness) - #163954 (fix(bootstrap/darwin): fix rpath for distributed LLD) - #163193 (cfi: mangle `f128` as `e` rather than `g` on platforms without `_Float128`) - #163634 (move overflow lint computation into decorator) - #163666 (Updates the expect message library/core/src/time.rs) - #163727 (rigid aliases to non-rigid for fully normalized check) - #163745 (replace `fully_monomorphized` with `cx.typing_env()`) - #163912 (Fix debug assert failure in `note_obligation_cause_code_inner`) - #163950 (don't treat inherited opaques as defining) - #164000 (When mentioning that closure doesn't implement trait, point at closure) - #164007 ([rustdoc] Prefer local paths over remote ones when foreign item is locally reexported) - #164017 (cg_llvm: Avoid some explicit casts to `*const c_char`) - #164025 (Less `CanonicalVarValues`)
rust-bors Bot
pushed a commit
that referenced
this pull request
Oct 9, 2026
…uwer Rollup of 24 pull requests Successful merges: - #161998 ( Support type-relative assoc item paths in generic param defaults & const param types) - #162106 (Helpful suggestions for incorrect address-of mutability (2)) - #162652 (Syntactically reject leading parenthesized precise capturing lists in bare trait object types (`(use<…>)+`)) - #163337 (MIR move elimination [3/6]: PreciseLiveness) - #163938 (-Zassumptions-on-binders: rewrite alias outlives constraints more goodly) - #163939 (Better debug impls for some assumptions on binders types) - #163954 (fix(bootstrap/darwin): fix rpath for distributed LLD) - #163956 (Pass the unremapped path to the `rustc` invocation for doctests) - #164042 (Allow testing cg-gcc on any target) - #162443 (Do not retain `Normalization` goal errors in nested goals for `BestObligationVisitor:: non_trivial_candidates `) - #162908 (Fix - const parameters rejected when identical) - #163193 (cfi: mangle `f128` as `e` rather than `g` on platforms without `_Float128`) - #163634 (move overflow lint computation into decorator) - #163666 (Updates the expect message library/core/src/time.rs) - #163727 (rigid aliases to non-rigid for fully normalized check) - #163745 (replace `fully_monomorphized` with `cx.typing_env()`) - #163912 (Fix debug assert failure in `note_obligation_cause_code_inner`) - #163950 (don't treat inherited opaques as defining) - #163972 (const-eval: ICE when we hit a non-const fn) - #164000 (When mentioning that closure doesn't implement trait, point at closure) - #164007 ([rustdoc] Prefer local paths over remote ones when foreign item is locally reexported) - #164008 (properly ignore the current goal's usages) - #164017 (cg_llvm: Avoid some explicit casts to `*const c_char`) - #164025 (Less `CanonicalVarValues`)
rust-bors Bot
pushed a commit
that referenced
this pull request
Oct 9, 2026
Rollup merge of #163954 - rami3l:fix/bootstrap-darwin-lld, r=Kobzol fix(bootstrap/darwin): fix rpath for distributed LLD Closes #163947 by mirroring the existing rpath tweak for linux on darwin. ## Concerns - [ ] Is there an easy way to reliably test the effect of this fix (there doesn't seem to be dist tests for darwin in particular)? I'd love to add one if possible.
danieljhkim
added a commit
to danieljhkim/rust
that referenced
this pull request
Oct 10, 2026
`rust-objcopy` is a renamed copy of `llvm-objcopy` shipped in the `rustc` component at `lib/rustlib/$host/bin`. When LLVM is linked dynamically it only carries LLVM's default `$ORIGIN/../lib` (`@loader_path/../lib` on darwin) rpath, which does not reach the `libLLVM` shipped in `lib/`, so it fails to load outside rustup's library path overrides. Mirror the rpath entry `Lld::run` already adds for `rust-lld` (rust-lang#163954) on the LLVM tools themselves. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #163947 by mirroring the existing rpath tweak for linux on darwin.
Concerns