diff options
| author | bors <bors@rust-lang.org> | 2013-09-22 22:20:50 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-22 22:20:50 -0700 |
| commit | 03e5e9631567904e03ec61b698a1eeff1372125d (patch) | |
| tree | 38f77e58498a2f243a64c61617e2095ef115ae16 | |
| parent | 40834a0c23b32416af6a04512c6937004e487a88 (diff) | |
| parent | 0442764a9ba46659441b5880556b96b2a1c77010 (diff) | |
| download | rust-03e5e9631567904e03ec61b698a1eeff1372125d.tar.gz rust-03e5e9631567904e03ec61b698a1eeff1372125d.zip | |
auto merge of #9385 : alexcrichton/rust/actually-ndebug, r=pnkfelix
Turns out that even if the default is "enabled", that doesn't mean that the CFG_ENABLE_DEBUG variable will be defined. Instead, test whether CFG_DISABLE_DEBUG is defined and disable debug things if that's the case.
| -rw-r--r-- | Makefile.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index eca5c3453e6..6363326571e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,12 +100,13 @@ else CFG_RUSTC_FLAGS += -O --cfg rtopt endif -ifdef CFG_ENABLE_DEBUG - $(info cfg: enabling more debugging (CFG_ENABLE_DEBUG)) - CFG_GCCISH_CFLAGS += -DRUST_DEBUG -else +ifdef CFG_DISABLE_DEBUG CFG_RUSTC_FLAGS += --cfg ndebug CFG_GCCISH_CFLAGS += -DRUST_NDEBUG +else + $(info cfg: enabling more debugging (CFG_ENABLE_DEBUG)) + CFG_RUSTC_FLAGS += --cfg debug + CFG_GCCISH_CFLAGS += -DRUST_DEBUG endif ifdef SAVE_TEMPS |