Proper macOS libLLVM symlink when cross compiling#98880
Merged
bors merged 1 commit intorust-lang:masterfrom Jul 6, 2022
topjohnwu:macos-dylib-cross
Merged
Proper macOS libLLVM symlink when cross compiling#98880bors merged 1 commit intorust-lang:masterfrom topjohnwu:macos-dylib-cross
bors merged 1 commit intorust-lang:masterfrom
topjohnwu:macos-dylib-cross
Conversation
When cross compiling on macOS with `llvm.link-shared` enabled, the symlink creation will fail after compiling LLVM for the target architecture, because it will attempt to create the symlink in the host LLVM directory, which was already created when being built. This commit changes the symlink path to the actual LLVM output.
rust-highfive
added
the
S-waiting-on-review
Member
|
Oh, sorry, I misunderstood on your original PR - if that PR introduces a new bug, we should fix it there before it's merged. I thought you were fixing additional existing bugs after it had been approved, which I'd rather avoid - bors will merge the original after you push changes, which is confusing for everyone. |
Member
|
Ah no #98418 is a different third PR. Sorry for the confusion. |
jyn514
added
the
T-bootstrap
Member
|
@bors r+ |
Collaborator
|
📌 Commit 22b4ea4 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 5, 2022
…laumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#95503 (bootstrap: Allow building individual crates) - rust-lang#96814 (Fix repr(align) enum handling) - rust-lang#98256 (Fix whitespace handling after where clause) - rust-lang#98880 (Proper macOS libLLVM symlink when cross compiling) - rust-lang#98944 (Edit `rustc_mir_dataflow::framework::lattice::FlatSet` docs) - rust-lang#98951 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
5 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.
Follow up of #98418
When cross compiling on macOS with
llvm.link-sharedenabled, the symlink creation will fail after compiling LLVM for the target architecture, because it will attempt to create the symlink in the host LLVM directory, which was already created when being built.This commit changes the symlink path to the actual LLVM output.
r? @jyn514