diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-09-13 20:21:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-13 20:21:20 +0200 |
| commit | 51cf121e6d5c633c819e37c6eea591bc8f2c8475 (patch) | |
| tree | fd45ee6fd6cbccc0f83d985fd64668dcd53f7c66 | |
| parent | 305d63c2a430c5d252c21b51f4d24a4288d08062 (diff) | |
| parent | cf0720146e89a9af8759951aaf774ef19f33f556 (diff) | |
| download | rust-51cf121e6d5c633c819e37c6eea591bc8f2c8475.tar.gz rust-51cf121e6d5c633c819e37c6eea591bc8f2c8475.zip | |
Rollup merge of #76667 - matklad:patch-llvm, r=Mark-Simulacrum
Fix CI LLVM to work on NixOS out of the box r? @Mark-Simulacrum Tested locally, seems to work!
| -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)) |