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.

Sign up for GitHub

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

Jump to bottom

Rollup of 9 pull requests #81983

Closed
wants to merge 20 commits into from
Closed

Rollup of 9 pull requests #81983

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
57ace0d
Ensures `make` tests run under /bin/dash, like CI, and fixes a Makefile
richkadel Feb 4, 2021
ca3a714
Set SHELL = /bin/dash only if it exists
richkadel Feb 6, 2021
471ed5f
Use ItemCtxt::to_ty
camsteffen Feb 10, 2021
883988b
RELEASES.md 1.50: Group platform support notes together
joshtriplett Feb 10, 2021
d3fea13
bootstrap: Locate llvm-dwp based on llvm-config bindir
dtolnay Feb 10, 2021
3c1d792
Only initialize what is used
bugadani Jan 17, 2021
a6d4137
Fix assosiated typo
therealprof Feb 10, 2021
d64b749
Allow casting mut array ref to mut ptr
osa1 Jan 28, 2021
f13bbea
Catch errors on localStorage setting failure
lovasoa Feb 10, 2021
16f0ccd
Fix getCurrentValue
lovasoa Feb 10, 2021
5034b50
bootstrap: fix wrong docs installation path
pietroalbini Feb 10, 2021
b16c54c
Rollup merge of #81129 - bugadani:lighter-move-errors, r=petrochenkov
JohnTitor Feb 11, 2021
e1f0108
Rollup merge of #81479 - osa1:issue24151, r=lcnr
JohnTitor Feb 11, 2021
3a1c146
Rollup merge of #81734 - richkadel:fixfordash, r=pnkfelix
JohnTitor Feb 11, 2021
7143db0
Rollup merge of #81947 - camsteffen:to-ty, r=jyn514
JohnTitor Feb 11, 2021
2d7d7b4
Rollup merge of #81954 - joshtriplett:release-notes-group-platform-no…
JohnTitor Feb 11, 2021
25f1a61
Rollup merge of #81955 - dtolnay:dwp, r=Mark-Simulacrum
JohnTitor Feb 11, 2021
a06ccef
Rollup merge of #81959 - therealprof:fix-typo, r=oli-obk
JohnTitor Feb 11, 2021
2b19246
Rollup merge of #81964 - lovasoa:patch-1, r=GuillaumeGomez
JohnTitor Feb 11, 2021
12be68c
Rollup merge of #81968 - pietroalbini:fix-doc-install-path, r=Mark-Si…
JohnTitor Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bootstrap: Locate llvm-dwp based on llvm-config bindir
  • Loading branch information
@dtolnay
dtolnay committed Feb 10, 2021
commit d3fea13ae0949a64b5809ba6a7304307ddf3528e
7 changes: 5 additions & 2 deletions src/bootstrap/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,8 +1075,11 @@ impl Step for Assemble {
let src_exe = exe("llvm-dwp", target_compiler.host);
let dst_exe = exe("rust-llvm-dwp", target_compiler.host);
let llvm_config_bin = builder.ensure(native::Llvm { target: target_compiler.host });
let llvm_bin_dir = llvm_config_bin.parent().unwrap();
builder.copy(&llvm_bin_dir.join(&src_exe), &libdir_bin.join(&dst_exe));
if !builder.config.dry_run {
let llvm_bin_dir = output(Command::new(llvm_config_bin).arg("--bindir"));
let llvm_bin_dir = Path::new(llvm_bin_dir.trim());
builder.copy(&llvm_bin_dir.join(&src_exe), &libdir_bin.join(&dst_exe));
}
}

// Ensure that `libLLVM.so` ends up in the newly build compiler directory,
Expand Down