about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBruno Tavares <connect+github@bltavares.com>2016-05-30 17:29:29 -0300
committerBruno Tavares <connect+github@bltavares.com>2016-06-12 19:59:36 -0300
commit970f8d8731be823b741bfdd8b7fa54c7567894d3 (patch)
tree815c740544b64f1d9217b3e314a9d5b64720e750
parentabc57aba059e97eb6a49c151ea3c8644b0b48457 (diff)
downloadrust-970f8d8731be823b741bfdd8b7fa54c7567894d3.tar.gz
rust-970f8d8731be823b741bfdd8b7fa54c7567894d3.zip
Use --release-channel=stable by default on releases
> Release tarballs should be compilable with just basic ./configure ;
> make ; sudo make install without having to pass special flags to
> configure. This is the case of the --release-channel option, that must
> be changed in the releases.

This commit detects the presence of .git, as it happens on other parts
of `configure` to assume it is a tarball. Then it changes the default
value stored, before parsing the arguments, while still allowing it to
be overriden before any action verifying the flag is done.

Closes #28322
-rwxr-xr-xconfigure12
1 files changed, 11 insertions, 1 deletions
diff --git a/configure b/configure
index 5edfd0ed5a1..3302c26ec70 100755
--- a/configure
+++ b/configure
@@ -637,10 +637,20 @@ valopt arm-linux-androideabi-ndk "" "arm-linux-androideabi NDK standalone path"
 valopt armv7-linux-androideabi-ndk "" "armv7-linux-androideabi NDK standalone path"
 valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
 valopt nacl-cross-path  "" "NaCl SDK path (Pepper Canary is recommended). Must be absolute!"
-valopt release-channel "dev" "the name of the release channel to build"
 valopt musl-root "/usr/local" "MUSL root installation directory"
 valopt extra-filename "" "Additional data that is hashed and passed to the -C extra-filename flag"
 
+if [ -e ${CFG_SRC_DIR}.git ]
+then
+    valopt release-channel "dev" "the name of the release channel to build"
+else
+    # If we have no git directory then we are probably a tarball distribution
+    # and should default to stable channel - Issue 28322
+    probe CFG_GIT          git
+    msg "git: no git directory. Changing default release channel to stable"
+    valopt release-channel "stable" "the name of the release channel to build"
+fi
+
 # Used on systems where "cc" and "ar" are unavailable
 valopt default-linker "cc" "the default linker"
 valopt default-ar     "ar" "the default ar"