summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-01-13 15:35:58 -0800
committerAlex Crichton <alex@alexcrichton.com>2017-01-16 22:26:21 -0800
commit06185802356b49a71dfa6fc396fe6c7982bd5076 (patch)
tree6a5e15e81890489ad32729dfd4c6f23152c891ae /configure
parentAuto merge of #38949 - GuillaumeGomez:fix_linker, r=nagisa (diff)
downloadgrust-06185802356b49a71dfa6fc396fe6c7982bd5076.tar.gz
grust-06185802356b49a71dfa6fc396fe6c7982bd5076.tar.bz2
grust-06185802356b49a71dfa6fc396fe6c7982bd5076.tar.xz
travis: Pass --release-channel=nightly on deploy
This commit passes the `--release-channel=nightly` flag to all images which have the `DEPLOY` flag set. This means that we'll name artifacts and the compiler appropriately. This reworks a bit how arguments are passed, but for now doesn't change what's already being passed. Eventually we'll want to avoid enabling debug assertions and llvm assertions for *all* releases, but I figure we can tackle that a little bit more down the road.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index fa81684fb4..208fb7e683 100755
--- a/configure
+++ b/configure
@@ -745,7 +745,7 @@ fi
745case "$CFG_RELEASE_CHANNEL" in 745case "$CFG_RELEASE_CHANNEL" in
746 nightly ) 746 nightly )
747 msg "overriding settings for $CFG_RELEASE_CHANNEL" 747 msg "overriding settings for $CFG_RELEASE_CHANNEL"
748 CFG_ENABLE_LLVM_ASSERTIONS=1 748 enable_if_not_disabled llvm-assertions
749 # FIXME(stage0) re-enable this on the next stage0 now that #35566 is 749 # FIXME(stage0) re-enable this on the next stage0 now that #35566 is
750 # fixed 750 # fixed
751 case "$CFG_BUILD" in 751 case "$CFG_BUILD" in