]> git.lizzy.rs Git - rust.git/commit - src/tools/miri
Auto merge of #98526 - jyn514:download-llvm-outside-checkout, r=Mark-Simulacrum
authorbors <bors@rust-lang.org>
Mon, 11 Jul 2022 01:15:47 +0000 (01:15 +0000)
committerbors <bors@rust-lang.org>
Mon, 11 Jul 2022 01:15:47 +0000 (01:15 +0000)
commitadaddb5bab936250535665fe1e7c6982d03352cb
tree81c99ebc57be6afd5a3e80aeee597efce9b260f7
parente1b348fe21726a821144a51094ca762b12280df4
parent56e42b87139154d6f782ccb333ee9f7db4bb99ef
Auto merge of #98526 - jyn514:download-llvm-outside-checkout, r=Mark-Simulacrum

Allow using `download-ci-llvm = true` outside the git checkout

`@bjorn3` noticed that this is already allowed today when download-llvm is disabled, but breaks with it enabled:
```
$ ./rust2/x.py build
fatal: not a git repository (or any of the parent directories): .git
thread 'main' panicked at 'command did not execute successfully: "git" "rev-list" "--author=bors@rust-lang.org" "-n1" "--first-parent" "HEAD" "--" "/home/jnelson/rust-lang/rust2/src/llvm-project" "/home/jnelson/rust-lang/rust2/src/bootstrap/download-ci-llvm-stamp" "/home/jnelson/rust-lang/rust2/src/version"
expected success, got: exit status: 128', src/bootstrap/native.rs:134:20
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
```

Support it too for consistency. It's unclear to me when anyone would need to use this, but `@bjorn3`
feels we should support it, and it's not much additional effort to get it working.
src/bootstrap/config.rs
src/bootstrap/format.rs
src/bootstrap/lib.rs
src/bootstrap/native.rs
src/bootstrap/setup.rs