Skip to content

Commit 45eb54c

Browse files
committed
configure: Remove obsolete --nightly flag
1 parent 9266d59 commit 45eb54c

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

configure

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
<#!/bin/sh
22

33
msg() {
44
echo "configure: $1"
@@ -540,7 +540,6 @@ opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
540540
opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
541541
opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM"
542542
opt rpath 0 "build rpaths into rustc itself"
543-
opt nightly 0 "build nightly packages"
544543
opt verify-install 1 "verify installed binaries work"
545544
# This is used by the automation to produce single-target nightlies
546545
opt dist-host-only 0 "only install bins for the host architecture"
@@ -556,6 +555,7 @@ valopt llvm-root "" "set LLVM root"
556555
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
557556
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
558557
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path"
558+
valopt release-channel "dev" "the name of the release channel to build"
559559

560560
# Many of these are saved below during the "writing configuration" step
561561
# (others are conditionally saved).
@@ -568,7 +568,6 @@ valopt_nosave local-rust-root "/usr/local" "set prefix for local rust binary"
568568
valopt_nosave host "${CFG_BUILD}" "GNUs ./configure syntax LLVM host triples"
569569
valopt_nosave target "${CFG_HOST}" "GNUs ./configure syntax LLVM target triples"
570570
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"
572571

573572
# Temporarily support old triples until buildbots get updated
574573
CFG_BUILD=$(to_llvm_triple $CFG_BUILD)
@@ -621,14 +620,6 @@ case "$CFG_RELEASE_CHANNEL" in
621620
;;
622621
esac
623622

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-
632623
# A magic value that allows the compiler to use unstable features
633624
# during the bootstrap even when doing so would normally be an error
634625
# because of feature staging or because the build turns on

0 commit comments

Comments
 (0)