Skip to content

Commit 36dea6a

Browse files
committed
Fix error output of gcc version test
1 parent 0f5252f commit 36dea6a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

common/autoconf/generated-configure.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -4513,7 +4513,7 @@ VS_TOOLSET_SUPPORTED_2022=true
45134513
#CUSTOM_AUTOCONF_INCLUDE
45144514

45154515
# Do not change or remove the following line, it is needed for consistency checks:
4516-
DATE_WHEN_GENERATED=1716396030
4516+
DATE_WHEN_GENERATED=1729881789
45174517

45184518
###############################################################################
45194519
#
@@ -28920,8 +28920,8 @@ $as_echo "$as_me: The result from running it was: \"$COMPILER_VERSION_OUTPUT\""
2892028920
if test $? -ne 0; then
2892128921
{ $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
2892228922
$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
28923-
{ $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION\"" >&5
28924-
$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION\"" >&6;}
28923+
{ $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION_OUTPUT\"" >&5
28924+
$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION_OUTPUT\"" >&6;}
2892528925
as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
2892628926
fi
2892728927
# Remove Copyright and legalese from version string, and
@@ -30659,8 +30659,8 @@ $as_echo "$as_me: The result from running it was: \"$COMPILER_VERSION_OUTPUT\""
3065930659
if test $? -ne 0; then
3066030660
{ $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
3066130661
$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
30662-
{ $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION\"" >&5
30663-
$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION\"" >&6;}
30662+
{ $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION_OUTPUT\"" >&5
30663+
$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION_OUTPUT\"" >&6;}
3066430664
as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
3066530665
fi
3066630666
# Remove Copyright and legalese from version string, and
@@ -50158,7 +50158,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5015850158
#ifdef __cplusplus
5015950159
extern "C"
5016050160
#endif
50161-
char jpeg_CreateDecompress ();
50161+
char jpeg_CreateDecompress (void);
5016250162
int
5016350163
main (void)
5016450164
{
@@ -50988,9 +50988,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5098850988
#ifdef __cplusplus
5098950989
extern "C"
5099050990
#endif
50991-
char krb5_cc_default ();
50991+
char krb5_cc_default (void);
5099250992
int
50993-
main ()
50993+
main (void)
5099450994
{
5099550995
return krb5_cc_default ();
5099650996
;
@@ -51204,9 +51204,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5120451204
#ifdef __cplusplus
5120551205
extern "C"
5120651206
#endif
51207-
char sctp_bindx ();
51207+
char sctp_bindx (void);
5120851208
int
51209-
main ()
51209+
main (void)
5121051210
{
5121151211
return sctp_bindx ();
5121251212
;

common/autoconf/toolchain.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
439439
$ECHO "$COMPILER_VERSION_OUTPUT" | $GREP -E "^(gcc|g\+\+|distcc)" >&AS_MESSAGE_LOG_FD 2>&1
440440
if test $? -ne 0; then
441441
AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
442-
AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION"])
442+
AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_OUTPUT"])
443443
AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.])
444444
fi
445445
# Remove Copyright and legalese from version string, and

0 commit comments

Comments
 (0)