Skip to content

Commit 970f8d8

Browse files
committed
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
1 parent abc57ab commit 970f8d8

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

configure

+11-1
Original file line numberDiff line numberDiff line change
@@ -637,10 +637,20 @@ valopt arm-linux-androideabi-ndk "" "arm-linux-androideabi NDK standalone path"
637637
valopt armv7-linux-androideabi-ndk "" "armv7-linux-androideabi NDK standalone path"
638638
valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
639639
valopt nacl-cross-path "" "NaCl SDK path (Pepper Canary is recommended). Must be absolute!"
640-
valopt release-channel "dev" "the name of the release channel to build"
641640
valopt musl-root "/usr/local" "MUSL root installation directory"
642641
valopt extra-filename "" "Additional data that is hashed and passed to the -C extra-filename flag"
643642

643+
if [ -e ${CFG_SRC_DIR}.git ]
644+
then
645+
valopt release-channel "dev" "the name of the release channel to build"
646+
else
647+
# If we have no git directory then we are probably a tarball distribution
648+
# and should default to stable channel - Issue 28322
649+
probe CFG_GIT git
650+
msg "git: no git directory. Changing default release channel to stable"
651+
valopt release-channel "stable" "the name of the release channel to build"
652+
fi
653+
644654
# Used on systems where "cc" and "ar" are unavailable
645655
valopt default-linker "cc" "the default linker"
646656
valopt default-ar "ar" "the default ar"

0 commit comments

Comments
 (0)