diff options
| author | Josh Stone <jistone@redhat.com> | 2019-03-30 11:14:02 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2019-03-30 11:14:02 -0700 |
| commit | 49b65e683dbf7b710deaede48a66211ce924c851 (patch) | |
| tree | 8a82f25ef908aeb1b5125f42a7d9a0d158f3e4d4 /src/bootstrap/lib.rs | |
| parent | 105692c3ad281c63bf0f75a26a66bb9cff5b4553 (diff) | |
| download | rust-49b65e683dbf7b710deaede48a66211ce924c851.tar.gz rust-49b65e683dbf7b710deaede48a66211ce924c851.zip | |
Don't ignore git for LLVM info
Diffstat (limited to 'src/bootstrap/lib.rs')
| -rw-r--r-- | src/bootstrap/lib.rs | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 167455af1f2..2394ae7fb79 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -360,14 +360,18 @@ impl Build { } None => false, }; - let rust_info = channel::GitInfo::new(&config, &src); - let cargo_info = channel::GitInfo::new(&config, &src.join("src/tools/cargo")); - let rls_info = channel::GitInfo::new(&config, &src.join("src/tools/rls")); - let clippy_info = channel::GitInfo::new(&config, &src.join("src/tools/clippy")); - let miri_info = channel::GitInfo::new(&config, &src.join("src/tools/miri")); - let rustfmt_info = channel::GitInfo::new(&config, &src.join("src/tools/rustfmt")); - let in_tree_llvm_info = channel::GitInfo::new(&config, &src.join("src/llvm-project")); - let emscripten_llvm_info = channel::GitInfo::new(&config, &src.join("src/llvm-emscripten")); + + let ignore_git = config.ignore_git; + let rust_info = channel::GitInfo::new(ignore_git, &src); + let cargo_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/cargo")); + let rls_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/rls")); + let clippy_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/clippy")); + let miri_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/miri")); + let rustfmt_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/rustfmt")); + + // we always try to use git for LLVM builds + let in_tree_llvm_info = channel::GitInfo::new(false, &src.join("src/llvm-project")); + let emscripten_llvm_info = channel::GitInfo::new(false, &src.join("src/llvm-emscripten")); let mut build = Build { initial_rustc: config.initial_rustc.clone(), |