Skip to content

Add libLLVM.so to the target libdir when download-rustc is enabled - #110263

Merged
bors merged 1 commit into
rust-lang:masterfrom
jyn514:ui-fulldeps-llvm
Apr 14, 2023
Merged

Add libLLVM.so to the target libdir when download-rustc is enabled#110263
bors merged 1 commit into
rust-lang:masterfrom
jyn514:ui-fulldeps-llvm

Conversation

@jyn514

Copy link
Copy Markdown
Member

Previously, we would only add it to the host libdir, which meant it couldn't be loaded by ui-fulldeps tests that used rustc_private.

Fixes#110225, fixes#110226.

Previously, we would only add it to the host libdir, which meant it
couldn't be loaded by `ui-fulldeps` tests that used rustc_private.
@jyn514jyn514 added the A-download-rustc Area: The `rust.download-rustc` build option. label Apr 13, 2023
@rustbot

Copy link
Copy Markdown
Collaborator

r? @albertlarsan68

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Apr 13, 2023
@albertlarsan68

Copy link
Copy Markdown
Member

LGTM
Thanks for the PR!
@bors r+

@bors

bors commented Apr 13, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 7d64c7c has been approved by albertlarsan68

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 13, 2023
@jyn514

Copy link
Copy Markdown
MemberAuthor

This fixes a regression from #110121:

 = note: /usr/bin/ld: /home/alona/dev/rust/rust/build/x86_64-unknown-linux-gnu/ci-rustc-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_driver-a330ea589693868f.so: undefined reference to `LLVMInitializeLoongArchAsmPrinter@LLVM_16'
clang: error: linker command failed with exit code 1 (use -v to see invocation)

@bors p=1

@bors

bors commented Apr 14, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7d64c7c with merge 276fa29...

@bors

bors commented Apr 14, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: albertlarsan68
Pushing 276fa29 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 14, 2023
@bors
bors merged commit 276fa29 into rust-lang:masterApr 14, 2023
@rustbotrustbot added this to the 1.70.0 milestone Apr 14, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (276fa29): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

@jyn514
jyn514 deleted the ui-fulldeps-llvm branch April 15, 2023 10:24
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 19, 2023
…rtlarsan68
Don't special-case download-rustc in `maybe_install_llvm`
This is no longer necessary now that the llvm in `rust-dev` matches the one in `rustc`.
cc rust-lang#110490 (comment), rust-lang#110263
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-download-rustcArea: The `rust.download-rustc` build option.merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

5 participants

@jyn514@rustbot@albertlarsan68@bors@rust-timer