---

bors · bors · commit 4805c57f17d9 · 2013-09-22T22:20:50.000-07:00
yaml --- r: 81773 b: refs/heads/master c: 03e5e96 h: refs/heads/master i: 81771: 9ebaf6f v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 40834a0c23b32416af6a04512c6937004e487a88
+refs/heads/master: 03e5e9631567904e03ec61b698a1eeff1372125d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
diff --git a/trunk/Makefile.in b/trunk/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
