Skip to content

Commit

Permalink
Actually default rustc to have debug! output
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@alexcrichton
alexcrichton committed Sep 22, 2013
1 parent db78fdc commit 0442764
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

9 comments on commit 0442764

@bors
Copy link
Contributor

@bors bors commented on 0442764 Sep 23, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pnkfelix
at alexcrichton@0442764

@bors
Copy link
Contributor

@bors bors commented on 0442764 Sep 23, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/actually-ndebug = 0442764 into auto

@bors
Copy link
Contributor

@bors bors commented on 0442764 Sep 23, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/actually-ndebug = 0442764 merged ok, testing candidate = 563e6bb1

@bors
Copy link
Contributor

@bors bors commented on 0442764 Sep 23, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/752
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1642
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1645
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/751
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/751
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1660
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/751
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/751
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1660
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/751
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/752
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/832
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1645
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/751
exception: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/1429

@bors
Copy link
Contributor

@bors bors commented on 0442764 Sep 23, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pnkfelix
at alexcrichton@0442764

@bors
Copy link
Contributor

@bors bors commented on 0442764 Sep 23, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/actually-ndebug = 0442764 into auto

@bors
Copy link
Contributor

@bors bors commented on 0442764 Sep 23, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/actually-ndebug = 0442764 merged ok, testing candidate = 03e5e96

@bors
Copy link
Contributor

@bors bors commented on 0442764 Sep 23, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1643
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1646
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/752
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/752
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1661
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/752
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/752
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1661
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/752
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/753
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/833
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1646
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/752
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/753
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/1430

@bors
Copy link
Contributor

@bors bors commented on 0442764 Sep 23, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 03e5e96

Please sign in to comment.