diff options
author | bors <bors@rust-lang.org> | 2021-02-10 17:36:11 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2021-02-10 17:36:11 +0000 |
commit | cb75ad5db02783e8b0222fee363c5f63f7e2cf5b (patch) | |
tree | 346ca2d8767c664ea828e35385a8194e4ddbdcf6 | |
parent | 690501e3e9535389a1441cee74d049ba16b963fa (diff) | |
parent | a7f4cce1cef081595da9e1a77157460e9a0a950a (diff) |
Auto merge of #81963 - pietroalbini:stable-1.50.0-pre2, r=pietroalbini1.50.0
Rebuild 1.50.0 stable
This PR rebuilds the 1.50.0 stable release with the following backport:
* bootstrap: Locate llvm-dwp based on llvm-config bindir #81955
cc `@rust-lang/release`
-rw-r--r-- | src/bootstrap/compile.rs | 7 | ||||
-rw-r--r-- | src/bootstrap/install.rs | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 091bd2a1c5a..a31c87d4311 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1021,8 +1021,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, diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs index fd0acc3a919..22124ec67f5 100644 --- a/src/bootstrap/install.rs +++ b/src/bootstrap/install.rs @@ -29,7 +29,7 @@ fn install_sh( let prefix = default_path(&builder.config.prefix, "/usr/local"); let sysconfdir = prefix.join(default_path(&builder.config.sysconfdir, "/etc")); let datadir = prefix.join(default_path(&builder.config.datadir, "share")); - let docdir = prefix.join(default_path(&builder.config.docdir, "share/doc")); + let docdir = prefix.join(default_path(&builder.config.docdir, "share/doc/rust")); let mandir = prefix.join(default_path(&builder.config.mandir, "share/man")); let libdir = prefix.join(default_path(&builder.config.libdir, "lib")); let bindir = prefix.join(&builder.config.bindir); // Default in config.rs |