Skip to content
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.

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

Don't copy llvm tools to sysroot when using download-ci-llvm #91720

Merged
merged 1 commit into from
Dec 11, 2021

Conversation

Aaron1011
Copy link
Member

Fixes #91710

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 9, 2021
@Aaron1011
Copy link
Member Author

@Mark-Simulacrum I've updated the PR to copy each tool that exists on disk.

@Mark-Simulacrum
Copy link
Member

@bors r+ p=1 (given ~widespread breakage)

@bors
Copy link
Contributor

bors commented Dec 9, 2021

📌 Commit faf407d has been approved by Mark-Simulacrum

@bors bors 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 Dec 9, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 9, 2021
…k-Simulacrum

Don't copy llvm tools to sysroot when using download-ci-llvm

Fixes rust-lang#91710
@bors
Copy link
Contributor

bors commented Dec 9, 2021

⌛ Testing commit faf407d with merge b50b92ec1f95b1ea5b7b087d79103f17c5bfac27...

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Dec 9, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 9, 2021
@Aaron1011
Copy link
Member Author

@bors retry

@bors bors 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 Dec 10, 2021
@@ -1173,7 +1173,12 @@ impl Step for Assemble {
// (e.g. the `bootimage` crate).
for tool in LLVM_TOOLS {
let tool_exe = exe(tool, target_compiler.host);
builder.copy(&llvm_bin_dir.join(&tool_exe), &libdir_bin.join(&tool_exe));
let src_path = llvm_bin_dir.join(&tool_exe);
// When using `donwload-ci-llvm`, some of the tools
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*download

@bors
Copy link
Contributor

bors commented Dec 11, 2021

⌛ Testing commit faf407d with merge 4a66a70...

@bors
Copy link
Contributor

bors commented Dec 11, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 4a66a70 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 11, 2021
@bors bors merged commit 4a66a70 into rust-lang:master Dec 11, 2021
@rustbot rustbot added this to the 1.59.0 milestone Dec 11, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4a66a70): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing tools in LLVM CI tarball
8 participants