Skip to content

Commit

Permalink
Rollup merge of rust-lang#76667 - matklad:patch-llvm, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Fix CI LLVM to work on NixOS out of the box

r? @Mark-Simulacrum

Tested locally, seems to work!
  • Loading branch information
RalfJung authored Sep 13, 2020
2 parents b83d585 + cf07201 commit 115ebea
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,8 @@ def download_stage0(self):
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))

Expand Down

0 comments on commit 115ebea

Please sign in to comment.