diff options
| author | bors <bors@rust-lang.org> | 2016-12-19 07:52:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-19 07:52:42 +0000 |
| commit | e70415bd716cdbfaa7d7e849cb1d3b09254a7dcb (patch) | |
| tree | 492aaccdab61589bfbf739339662461593896426 | |
| parent | cc662efca1e2a070887839a935c3d14de4991526 (diff) | |
| parent | 9350016d7de824462fe1faad00a8b378fa66043a (diff) | |
| download | rust-e70415bd716cdbfaa7d7e849cb1d3b09254a7dcb.tar.gz rust-e70415bd716cdbfaa7d7e849cb1d3b09254a7dcb.zip | |
Auto merge of #38411 - japaric:gh38406, r=alexcrichton
llvm: backport r280651 fixes #38406 r? @alexcrichton (I'm secretly hoping this will error in the same way as #38314. That would sort of confirm that the problem is OOM and not enabling the SPARC backend)
| m--------- | src/llvm | 0 | ||||
| -rw-r--r-- | src/rustllvm/llvm-auto-clean-trigger | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/llvm b/src/llvm -Subproject d7342a9a957470bb62c890cf88fc655ccfb755c +Subproject ceb177eeefa7d67ca29230d2e7e8584f97d4fda diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger index 88dd04b6172..73c8bb97a14 100644 --- a/src/rustllvm/llvm-auto-clean-trigger +++ b/src/rustllvm/llvm-auto-clean-trigger @@ -1,4 +1,4 @@ # If this file is modified, then llvm will be forcibly cleaned and then rebuilt. # The actual contents of this file do not matter, but to trigger a change on the # build bots then the contents should be changed so git updates the mtime. -2016-12-08 +2016-12-16 |