diff options
| author | kennytm <kennytm@gmail.com> | 2018-03-04 02:18:25 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-03-04 02:18:25 +0800 |
| commit | ea354b6a0141c40eef98a2281ddfe7aed59510fb (patch) | |
| tree | 0282c7fc58d7db8aee7607a5602abf97467148f9 /src/bootstrap/compile.rs | |
| parent | 6f07aaa4289babffc83dc9f8b7257656d0349e5f (diff) | |
| parent | 6250a47ea6147a60e11e59aded80ebb62c8e3ab1 (diff) | |
| download | rust-ea354b6a0141c40eef98a2281ddfe7aed59510fb.tar.gz rust-ea354b6a0141c40eef98a2281ddfe7aed59510fb.zip | |
Rollup merge of #48664 - Keruspe:codegen, r=alexcrichton
make codegen-backends directory name configurable This allows to parallel-install several versions of rust system-wide Fixes #48263
Diffstat (limited to 'src/bootstrap/compile.rs')
| -rw-r--r-- | src/bootstrap/compile.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 408d63be6c6..30ca9dffc19 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -514,7 +514,8 @@ fn rustc_cargo_env(build: &Build, cargo: &mut Command) { cargo.env("CFG_RELEASE", build.rust_release()) .env("CFG_RELEASE_CHANNEL", &build.config.channel) .env("CFG_VERSION", build.rust_version()) - .env("CFG_PREFIX", build.config.prefix.clone().unwrap_or_default()); + .env("CFG_PREFIX", build.config.prefix.clone().unwrap_or_default()) + .env("CFG_CODEGEN_BACKENDS_DIR", &build.config.rust_codegen_backends_dir); let libdir_relative = build.config.libdir_relative().unwrap_or(Path::new("lib")); cargo.env("CFG_LIBDIR_RELATIVE", libdir_relative); |