user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused configuration parameter libdir_relative.

Browse source
This commit is contained in:
O01eg 2017-12-16 22:48:45 +03:00
parent 83e76d6f29
commit 472f4e1cc8
No known key found for this signature in database
GPG key ID: D1A94F2400FBC7E5
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bootstrap/builder.rs
View file

@ -357,8 +357,8 @@ impl<'a> Builder<'a> {
fn run(self, builder: &Builder) -> Interned<PathBuf> {
let compiler = self.compiler;
let lib = if compiler.stage >= 1 && builder.build.config.libdir_relative.is_some() {
builder.build.config.libdir_relative.clone().unwrap()
let lib = if compiler.stage >= 1 && builder.build.config.libdir.is_some() {
builder.build.config.libdir.clone().unwrap()
} else {
PathBuf::from("lib")
};

2
src/bootstrap/compile.rs
View file

@ -514,7 +514,7 @@ pub fn rustc_cargo(build: &Build,
.env("CFG_PREFIX", build.config.prefix.clone().unwrap_or_default());
let libdir_relative =
build.config.libdir_relative.clone().unwrap_or(PathBuf::from("lib"));
build.config.libdir.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

2
src/bootstrap/config.rs
View file

@ -121,7 +121,6 @@ pub struct Config {
pub docdir: Option<PathBuf>,
pub bindir: Option<PathBuf>,
pub libdir: Option<PathBuf>,
pub libdir_relative: Option<PathBuf>,
pub mandir: Option<PathBuf>,
pub codegen_tests: bool,
pub nodejs: Option<PathBuf>,
@ -403,7 +402,6 @@ impl Config {
config.docdir = install.docdir.clone().map(PathBuf::from);
config.bindir = install.bindir.clone().map(PathBuf::from);
config.libdir = install.libdir.clone().map(PathBuf::from);
config.libdir_relative = install.libdir.clone().map(PathBuf::from);
config.mandir = install.mandir.clone().map(PathBuf::from);
}