Skip to content

Commit

Permalink
Auto merge of #24205 - brson:debug, r=alexcrichton
Browse files Browse the repository at this point in the history
This makes the default configuration fully optimized, with no debugging options, no llvm asserts, renames --enable-debug to --enable-debug-assertions, and adds --enable-debug as a blanket option that toggles various things, per #17665. It does not add a `--enable-release` flag since that would be a no-op.

cc @nrc

Fixes #22390
Fixes #17081
Partially addresses #17665
  • Loading branch information
bors committed Apr 9, 2015
2 parents 88fc543 + 0e0c841 commit 6b95d8b
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -617,11 +617,15 @@ fi
step_msg "validating $CFG_SELF args"
validate_opt

# Validate the release channel
# Validate the release channel, and configure options
case "$CFG_RELEASE_CHANNEL" in
(dev | nightly | beta | stable)
nightly )
msg "overriding settings for $CFG_RELEASE_CHANNEL"
CFG_ENABLE_LLVM_ASSERTIONS=1
;;
(*)
dev | beta | stable)
;;
*)
err "release channel must be 'dev', 'nightly', 'beta' or 'stable'"
;;
esac
Expand Down

0 comments on commit 6b95d8b

Please sign in to comment.