diff options
| author | bors <bors@rust-lang.org> | 2016-10-24 08:46:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 08:46:28 -0700 |
| commit | 7bd2427307018a68e0b77438bbe40d339a54e587 (patch) | |
| tree | e5f6492e3210b087db736cee091ca131356ad905 | |
| parent | ac468b67bffc6c386dd04b7955eec013ef99dc39 (diff) | |
| parent | f96a4cca8126341d58c816df03a5ead8b6628e33 (diff) | |
| download | rust-7bd2427307018a68e0b77438bbe40d339a54e587.tar.gz rust-7bd2427307018a68e0b77438bbe40d339a54e587.zip | |
Auto merge of #37365 - alexcrichton:fix-nightlies, r=brson
Try to fix the nightlies Touching up a few pieces after the fix for #37280 landed.
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | mk/main.mk | 2 | ||||
| -rw-r--r-- | mk/tests.mk | 1 |
3 files changed, 18 insertions, 3 deletions
diff --git a/configure b/configure index ceb67869efe..2bc8c72e3ea 100755 --- a/configure +++ b/configure @@ -722,11 +722,25 @@ case "$CFG_RELEASE_CHANNEL" in nightly ) msg "overriding settings for $CFG_RELEASE_CHANNEL" CFG_ENABLE_LLVM_ASSERTIONS=1 - CFG_ENABLE_DEBUGINFO_LINES=1 + + # FIXME(#37364) shouldn't have to disable this on windows-gnu + case "$CFG_BUILD" in + *-pc-windows-gnu) + ;; + *) + CFG_ENABLE_DEBUGINFO_LINES=1 + ;; + esac ;; beta | stable) msg "overriding settings for $CFG_RELEASE_CHANNEL" - CFG_ENABLE_DEBUGINFO_LINES=1 + case "$CFG_BUILD" in + *-pc-windows-gnu) + ;; + *) + CFG_ENABLE_DEBUGINFO_LINES=1 + ;; + esac ;; dev) ;; diff --git a/mk/main.mk b/mk/main.mk index d45e59d9b78..a5e37641220 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -144,7 +144,7 @@ ifdef CFG_ENABLE_DEBUGINFO CFG_RUSTC_FLAGS += -g else ifdef CFG_ENABLE_DEBUGINFO_LINES $(info cfg: enabling line number debuginfo (CFG_ENABLE_DEBUGINFO_LINES)) - CFG_RUSTC_FLAGS += -C debuginfo=1 + CFG_RUSTC_FLAGS += -Cdebuginfo=1 endif ifdef SAVE_TEMPS diff --git a/mk/tests.mk b/mk/tests.mk index fc1f4b5561a..1957c989eb0 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -632,6 +632,7 @@ endif # is a separate choice from whether to pass `-g` when building the # compiler and standard library themselves. CTEST_RUSTC_FLAGS := $$(subst -g,,$$(CTEST_RUSTC_FLAGS)) +CTEST_RUSTC_FLAGS := $$(subst -Cdebuginfo=1,,$$(CTEST_RUSTC_FLAGS)) ifdef CFG_ENABLE_DEBUGINFO_TESTS CTEST_RUSTC_FLAGS += -g endif |