diff options
| author | O01eg <o01eg@yandex.ru> | 2017-12-16 22:48:45 +0300 |
|---|---|---|
| committer | O01eg <o01eg@yandex.ru> | 2018-01-12 10:05:08 +0300 |
| commit | 472f4e1cc8c3a94f97a127334a82aeee43909577 (patch) | |
| tree | 5b6a12c1dcefe3303b9ab319b1dfd0aa40a86f83 /src/bootstrap | |
| parent | 83e76d6f29119cf997840fb8d38b4941ba68b748 (diff) | |
| download | rust-472f4e1cc8c3a94f97a127334a82aeee43909577.tar.gz rust-472f4e1cc8c3a94f97a127334a82aeee43909577.zip | |
Remove unused configuration parameter `libdir_relative`.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/builder.rs | 4 | ||||
| -rw-r--r-- | src/bootstrap/compile.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/config.rs | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index a8ef84ff1e9..a660b5cf852 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -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") }; diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 91a4f7e23ba..c6adfc7ffae 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -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 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 081425cc474..72e75fddc19 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -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); } |