auto merge of #17538 : brson/rust/winmk, r=alexcrichton

This commit is contained in:
bors 2014-09-29 12:43:13 +00:00
commit 5079a10b1e
2 changed files with 4 additions and 1 deletions

2
configure vendored
View file

@ -488,7 +488,7 @@ esac
# Continue supporting the old --enable-nightly flag to transition the bots
# XXX Remove me
if [ $CFG_ENABLE_NIGHTLY -eq 1 ]
if [ ! -z "$CFG_ENABLE_NIGHTLY" ]
then
CFG_RELEASE_CHANNEL=nightly
putvar CFG_RELEASE_CHANNEL