diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index c8e500a4f68c..1db39361aef9 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -500,7 +500,7 @@ impl Step for Rustc { /// Same as `std_cargo`, but for libtest pub fn rustc_cargo(build: &Build, - compiler: &Compiler, + _compiler: &Compiler, target: Interned, cargo: &mut Command) { cargo.arg("--features").arg(build.rustc_features()) @@ -514,13 +514,9 @@ pub fn rustc_cargo(build: &Build, .env("CFG_VERSION", build.rust_version()) .env("CFG_PREFIX", build.config.prefix.clone().unwrap_or_default()); - if compiler.stage == 0 { - cargo.env("CFG_LIBDIR_RELATIVE", "lib"); - } else { - let libdir_relative = - build.config.libdir_relative.clone().unwrap_or(PathBuf::from("lib")); - cargo.env("CFG_LIBDIR_RELATIVE", libdir_relative); - } + let libdir_relative = + build.config.libdir_relative.clone().unwrap_or(PathBuf::from("lib")); + cargo.env("CFG_LIBDIR_RELATIVE", libdir_relative); // If we're not building a compiler with debugging information then remove // these two env vars which would be set otherwise.