Auto merge of #29144 - dotdash:llvmup, r=alexcrichton

Fixes #28947
2015-10-19 07:48:20 +00:00 · 2015-10-19 07:48:20 +00:00 · 3e268f2fba
commit 3e268f2fba
parent 9ed32bba77 92276dc616
3 changed files with 7 additions and 3 deletions
--- 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
--- a/src/llvm
+++ b/src/llvm
@ -1 +1 @@
-Subproject commit 62ad301a2407a7aca50c1d5120c63597d676d29f
+Subproject commit cde1ed3196ba9b39bcf028e06e08a8722113a5cb
--- 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