offload: add libLLVM rpath for libomptarget - #162860
Merged
rust-bors[bot] merged 1 commit intoSep 18, 2026
Merged
Conversation
Collaborator
|
This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp. |
rustbot
added
S-waiting-on-review
Member
|
I think you'll need to rebase before this works, but let's try. @bors try jobs=dist-x86_64-linux |
This comment has been minimized.
This comment has been minimized.
Member
|
I tested dist locally and it works. You just shouldn't need the target check anymore after the rebase, since we simplified the build in a pr merged yesterday. |
rust-cloud-vms
Bot
force-pushed
the
offload-remove-ldlibrarypath
branch
from
September 17, 2026 13:23
c5e7260 to
0db4e55
Compare
Member
|
@bors try jobs=dist-x86_64-linux |
rust-bors Bot
pushed a commit
that referenced
this pull request
Sep 17, 2026
offload: add libLLVM rpath for libomptarget try-job: dist-x86_64-linux
This comment has been minimized.
This comment has been minimized.
Contributor
Member
|
@bors r+ rollup |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
rust-bors Bot
pushed a commit
that referenced
this pull request
Sep 18, 2026
…uwer Rollup of 10 pull requests Successful merges: - #161987 (fix `is_single_fp_element` for `s390x` and `x86`) - #162366 (Replace hard linked `metadata.rmeta` with a copy when finalizing the incremental compilation session dir fails) - #162552 (RISC-V: Add Zmmul target feature) - #162602 (Ensure concurrent rustc instances in the same process correctly lock the session dir) - #162885 (Remove one remaining use of `Level::Help`) - #162606 (c-b: Export `fmaf16` now that we have an implementation) - #162817 (rustc_{codegen_,}llvm: adapt to new ThreadModel API) - #162860 (offload: add libLLVM rpath for libomptarget) - #162895 (Avoid derive edits on macro-generated types) - #162899 (Error on invalid placements of the `cfi_encoding` attribute.)
rust-bors Bot
pushed a commit
that referenced
this pull request
Sep 18, 2026
Rollup merge of #162860 - sgasho:offload-remove-ldlibrarypath, r=ZuseZ4 offload: add libLLVM rpath for libomptarget fix: #162309 (comment) We can remove LD_LIBRARY_PATH=$(rustc +nightly --print sysroot)/lib when we run the offload code after this PR lands. libomptarget.so is in lib/rustlib/${target}/lib, and libLLVM is in lib/, three hierarchy above libomptarget. So we can specify $ORIGIN/../../../ Lld::run uses the same logic. <img width="520" height="285" alt="スクリーンショット 2026-09-17 3 16 48" src="https://github.com/user-attachments/assets/d8f4938d-7e37-4e56-af61-9f2ed7f2e5fc" /> <img width="589" height="454" alt="スクリーンショット 2026-09-17 3 17 02" src="https://github.com/user-attachments/assets/b5e8bf27-38b1-460c-a113-20176a669a05" /> I have not verified if it works yet. I'll share the result I can test on my local machine later, but testing using tarballs would be better? r? @ZuseZ4
Member
|
Once we verified it works on nightly, we should update the dev guide |
pull Bot
pushed a commit
to xtqqczze/rust-lang-rust-analyzer
that referenced
this pull request
Sep 21, 2026
…uwer Rollup of 10 pull requests Successful merges: - rust-lang/rust#161987 (fix `is_single_fp_element` for `s390x` and `x86`) - rust-lang/rust#162366 (Replace hard linked `metadata.rmeta` with a copy when finalizing the incremental compilation session dir fails) - rust-lang/rust#162552 (RISC-V: Add Zmmul target feature) - rust-lang/rust#162602 (Ensure concurrent rustc instances in the same process correctly lock the session dir) - rust-lang/rust#162885 (Remove one remaining use of `Level::Help`) - rust-lang/rust#162606 (c-b: Export `fmaf16` now that we have an implementation) - rust-lang/rust#162817 (rustc_{codegen_,}llvm: adapt to new ThreadModel API) - rust-lang/rust#162860 (offload: add libLLVM rpath for libomptarget) - rust-lang/rust#162895 (Avoid derive edits on macro-generated types) - rust-lang/rust#162899 (Error on invalid placements of the `cfi_encoding` attribute.)
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
3 participants
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.
fix: #162309 (comment)
We can remove LD_LIBRARY_PATH=$(rustc +nightly --print sysroot)/lib when we run the offload code after this PR lands.
libomptarget.so is in lib/rustlib/${target}/lib, and libLLVM is in lib/, three hierarchy above libomptarget. So we can specify $ORIGIN/../../../
Lld::run uses the same logic.
I have not verified if it works yet. I'll share the result I can test on my local machine later, but testing using tarballs would be better?
r? @ZuseZ4