1
- #! /bin/sh
1
+ < #!/bin/sh
2
2
3
3
msg() {
4
4
echo "configure: $1"
@@ -540,7 +540,6 @@ opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
540
540
opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
541
541
opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM"
542
542
opt rpath 0 "build rpaths into rustc itself"
543
- opt nightly 0 " build nightly packages"
544
543
opt verify-install 1 "verify installed binaries work"
545
544
# This is used by the automation to produce single-target nightlies
546
545
opt dist-host-only 0 "only install bins for the host architecture"
@@ -556,6 +555,7 @@ valopt llvm-root "" "set LLVM root"
556
555
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
557
556
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
558
557
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path"
558
+ valopt release-channel "dev" "the name of the release channel to build"
559
559
560
560
# Many of these are saved below during the "writing configuration" step
561
561
# (others are conditionally saved).
@@ -568,7 +568,6 @@ valopt_nosave local-rust-root "/usr/local" "set prefix for local rust binary"
568
568
valopt_nosave host "${CFG_BUILD}" "GNUs ./configure syntax LLVM host triples"
569
569
valopt_nosave target "${CFG_HOST}" "GNUs ./configure syntax LLVM target triples"
570
570
valopt_nosave mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
571
- valopt_nosave release-channel " dev" " the name of the release channel to build"
572
571
573
572
# Temporarily support old triples until buildbots get updated
574
573
CFG_BUILD=$(to_llvm_triple $CFG_BUILD)
@@ -621,14 +620,6 @@ case "$CFG_RELEASE_CHANNEL" in
621
620
;;
622
621
esac
623
622
624
- # Continue supporting the old --enable-nightly flag to transition the bots
625
- # XXX Remove me
626
- if [ ! -z " $CFG_ENABLE_NIGHTLY " ]
627
- then
628
- CFG_RELEASE_CHANNEL=nightly
629
- fi
630
- putvar CFG_RELEASE_CHANNEL
631
-
632
623
# A magic value that allows the compiler to use unstable features
633
624
# during the bootstrap even when doing so would normally be an error
634
625
# because of feature staging or because the build turns on
0 commit comments