diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-06-07 15:21:04 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 15:21:04 +0900 |
| commit | fa38fad5a2f111eb17b8beb833a053c30b61846a (patch) | |
| tree | b178c5aa34c7505c279bee99c14001c86aad988c /src/bootstrap | |
| parent | 4144019847c0cbe813816fe387956fc84935d375 (diff) | |
| parent | 6b45d59caa3495eb79625930f15a7761c4cbc3a4 (diff) | |
| download | rust-fa38fad5a2f111eb17b8beb833a053c30b61846a.tar.gz rust-fa38fad5a2f111eb17b8beb833a053c30b61846a.zip | |
Rollup merge of #86025 - bjorn3:no_rpath_cfg_prefix, r=jackh726
Remove the install prefix from the rpath set when using -Crpath It was broken anyway for rustup installs and nobody seems to have noticed. Fixes https://github.com/rust-lang/rust/issues/82392
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/compile.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 05bb6c04a3a..ed311e273b1 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -636,8 +636,7 @@ pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetS cargo .env("CFG_RELEASE", builder.rust_release()) .env("CFG_RELEASE_CHANNEL", &builder.config.channel) - .env("CFG_VERSION", builder.rust_version()) - .env("CFG_PREFIX", builder.config.prefix.clone().unwrap_or_default()); + .env("CFG_VERSION", builder.rust_version()); let libdir_relative = builder.config.libdir_relative().unwrap_or_else(|| Path::new("lib")); cargo.env("CFG_LIBDIR_RELATIVE", libdir_relative); |