diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-12-28 09:18:54 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-12-28 09:18:54 -0800 |
| commit | 16f8372e0895107ce594ffb111732e48ee35fe86 (patch) | |
| tree | a086a9fd20e8e069d3d58444bfa47758835a8ebc /src/bootstrap/compile.rs | |
| parent | 0807104c8fa90b084748940f7a7980b5a765264e (diff) | |
rustbuild: Implement DESTDIR support
This commit primarily starts supporting the `DESTDIR` environment variable like the old build system. Along the way this brings `config.toml` up to date with support in `config.mk` with install options supported. Closes #38441
Diffstat (limited to 'src/bootstrap/compile.rs')
| -rw-r--r-- | src/bootstrap/compile.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index b268686ca6c..efc8ae5fe79 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -187,7 +187,7 @@ pub fn rustc<'a>(build: &'a Build, target: &str, compiler: &Compiler<'a>) { cargo.env("CFG_RELEASE", &build.release) .env("CFG_RELEASE_CHANNEL", &build.config.channel) .env("CFG_VERSION", &build.version) - .env("CFG_PREFIX", build.config.prefix.clone().unwrap_or(String::new())) + .env("CFG_PREFIX", build.config.prefix.clone().unwrap_or(PathBuf::new())) .env("CFG_LIBDIR_RELATIVE", "lib"); if let Some(ref ver_date) = build.ver_date { |