40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
|
||
|
|
index 2748903f2d47..10d02d6db829 100644
|
||
|
|
--- a/src/bootstrap/builder.rs
|
||
|
|
+++ b/src/bootstrap/builder.rs
|
||
|
|
@@ -1231,7 +1231,8 @@ impl<'a> Builder<'a> {
|
||
|
|
cargo.arg("--frozen");
|
||
|
|
}
|
||
|
|
|
||
|
|
- cargo.env("RUSTC_INSTALL_BINDIR", &self.config.bindir);
|
||
|
|
+ // Try to use a sysroot-relative bindir, in case it was configured absolutely.
|
||
|
|
+ cargo.env("RUSTC_INSTALL_BINDIR", self.config.bindir_relative());
|
||
|
|
|
||
|
|
self.ci_env.force_coloring_in_ci(&mut cargo);
|
||
|
|
|
||
|
|
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
|
||
|
|
index d1bdfa0a7676..0c03b95c7b25 100644
|
||
|
|
--- a/src/bootstrap/config.rs
|
||
|
|
+++ b/src/bootstrap/config.rs
|
||
|
|
@@ -647,6 +647,20 @@ impl Config {
|
||
|
|
config
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /// Try to find the relative path of `bindir`, otherwise return it in full.
|
||
|
|
+ pub fn bindir_relative(&self) -> &Path {
|
||
|
|
+ let bindir = &self.bindir;
|
||
|
|
+ if bindir.is_absolute() {
|
||
|
|
+ // Try to make it relative to the prefix.
|
||
|
|
+ if let Some(prefix) = &self.prefix {
|
||
|
|
+ if let Ok(stripped) = bindir.strip_prefix(prefix) {
|
||
|
|
+ return stripped;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ bindir
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/// Try to find the relative path of `libdir`.
|
||
|
|
pub fn libdir_relative(&self) -> Option<&Path> {
|
||
|
|
let libdir = self.libdir.as_ref()?;
|