diff options
| author | bors <bors@rust-lang.org> | 2016-07-11 17:27:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-11 17:27:31 -0700 |
| commit | 3265bd54b5b3f32d038273afec7554f007a5ce1d (patch) | |
| tree | 5c712145c52adf7fcafe6fcf5df2fb3d406b7dce | |
| parent | 7ad125c4eb3d620c12a868dbe77180f1a133021b (diff) | |
| parent | 970f8d8731be823b741bfdd8b7fa54c7567894d3 (diff) | |
| download | rust-3265bd54b5b3f32d038273afec7554f007a5ce1d.tar.gz rust-3265bd54b5b3f32d038273afec7554f007a5ce1d.zip | |
Auto merge of #33971 - bltavares:28322/default-channel-to-stable-on-tarball, r=brson
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-x | configure | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/configure b/configure index 6451b87673f..16496eb89d4 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" |
