diff options
| author | bors <bors@rust-lang.org> | 2015-10-19 07:48:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-19 07:48:20 +0000 |
| commit | 3e268f2fbafca7e0a59bf77e17985a27c61d5a11 (patch) | |
| tree | 5d47359416b385b7d40f3d6e9de98731d0997484 | |
| parent | 9ed32bba778a38af942775b1a1013149e29dc822 (diff) | |
| parent | 92276dc616195f327ff793235fd81f498b565b8b (diff) | |
| download | rust-3e268f2fbafca7e0a59bf77e17985a27c61d5a11.tar.gz rust-3e268f2fbafca7e0a59bf77e17985a27c61d5a11.zip | |
Auto merge of #29144 - dotdash:llvmup, r=alexcrichton
Fixes #28947
| -rw-r--r-- | mk/main.mk | 6 | ||||
| m--------- | src/llvm | 0 | ||||
| -rw-r--r-- | src/rustllvm/llvm-auto-clean-trigger | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/mk/main.mk b/mk/main.mk index cb8af120ca6..1cd491a04f3 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -132,7 +132,11 @@ endif ifdef CFG_ENABLE_DEBUGINFO $(info cfg: enabling debuginfo (CFG_ENABLE_DEBUGINFO)) - CFG_RUSTC_FLAGS += -g + # FIXME: Re-enable -g in stage0 after new snapshot + #CFG_RUSTC_FLAGS += -g + RUSTFLAGS_STAGE1 += -g + RUSTFLAGS_STAGE2 += -g + RUSTFLAGS_STAGE3 += -g endif ifdef SAVE_TEMPS diff --git a/src/llvm b/src/llvm -Subproject 62ad301a2407a7aca50c1d5120c63597d676d29 +Subproject cde1ed3196ba9b39bcf028e06e08a8722113a5c diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger index df9dc8bc841..3b99aa3520b 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. -2015-09-11 +2015-10-18 |