]> git.lizzy.rs Git - rust.git/blob - src/ci/docker/host-x86_64/dist-powerpc-linux/patches/glibc/2.11.1/002-newer-gcc.patch
Merge commit '23d11428de3e973b34a5090a78d62887f821c90e' into clippyup
[rust.git] / src / ci / docker / host-x86_64 / dist-powerpc-linux / patches / glibc / 2.11.1 / 002-newer-gcc.patch
1 diff --git a/configure b/configure
2 index b6752d147c6b..6089a3403410 100755
3 --- a/configure
4 +++ b/configure
5 @@ -5079,7 +5079,7 @@ $as_echo_n "checking version of $CC... " >&6; }
6    ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
7    case $ac_prog_version in
8      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
9 -    3.4* | 4.[0-9]* )
10 +    3.4* | [4-9].* )
11         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
12      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
13  
14 diff --git a/configure.in b/configure.in
15 index 56849dfc489a..09677eb3d0c1 100644
16 --- a/configure.in
17 +++ b/configure.in
18 @@ -960,7 +960,7 @@ fi
19  # These programs are version sensitive.
20  AC_CHECK_TOOL_PREFIX
21  AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
22 -  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | 4.[0-9]* ],
23 +  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | [4-9].* ],
24    critic_missing="$critic_missing gcc")
25  AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
26    [GNU Make[^0-9]*\([0-9][0-9.]*\)],