diff options
| author | Aleksey Kladov <aleksey.kladov@gmail.com> | 2020-09-13 14:37:35 +0200 |
|---|---|---|
| committer | Aleksey Kladov <aleksey.kladov@gmail.com> | 2020-09-13 14:47:15 +0200 |
| commit | cf0720146e89a9af8759951aaf774ef19f33f556 (patch) | |
| tree | 802adab65e550e5e5a6a09f64df54ddd9de25206 /src/bootstrap | |
| parent | b6c84553c4fa47174d2510541a90243000fb44d8 (diff) | |
| download | rust-cf0720146e89a9af8759951aaf774ef19f33f556.tar.gz rust-cf0720146e89a9af8759951aaf774ef19f33f556.zip | |
Fix CI LLVM to work on NixOS out of the box
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 44a17f75451..5f78031e1c7 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -429,6 +429,8 @@ class RustBuild(object): llvm_assertions = self.get_toml('assertions', 'llvm') == 'true' if self.program_out_of_date(self.llvm_stamp(), llvm_sha + str(llvm_assertions)): self._download_ci_llvm(llvm_sha, llvm_assertions) + for binary in ["llvm-config", "FileCheck"]: + self.fix_bin_or_dylib("{}/bin/{}".format(self.llvm_root(), binary)) with output(self.llvm_stamp()) as llvm_stamp: llvm_stamp.write(self.date + llvm_sha + str(llvm_assertions)) |