mirror of
https://github.com/gnustep/libs-back.git
synced 2025-04-22 07:21:02 +00:00
Copied from base: only warn if compiler is different from the one configured in make
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@38494 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rmottola
parent
f2a11f86d8
commit
49d933c00f
3 changed files with 64 additions and 18 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2015-05-13 Riccardo Mottola <rm@gnu.org>
|
||||
|
||||
* configure.ac
|
||||
Copied from base: only warn if compiler is different from the one configured in make
|
||||
* configure
|
||||
regenerated
|
||||
|
||||
2015-05-12 Riccardo Mottola <rm@gnu.org>
|
||||
|
||||
* configure.ac
|
||||
|
|
|
|||
42
configure
vendored
42
configure
vendored
|
|
@ -2331,14 +2331,44 @@ test -n "$target_alias" &&
|
|||
#--------------------------------------------------------------------
|
||||
# Find the compiler
|
||||
#--------------------------------------------------------------------
|
||||
MAKECC=`gnustep-config --variable=CC`
|
||||
MAKECPP=`gnustep-config --variable=CPP`
|
||||
MAKECXX=`gnustep-config --variable=CXX`
|
||||
if test "$CC" = ""; then
|
||||
CC=`gnustep-config --variable=CC`
|
||||
CC=$MAKECC
|
||||
else
|
||||
if test "$CC" != "$MAKECC"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC). To a
|
||||
void conflicts/problems, reconfigure/reinstall gnustep-make to use $CC or run the gnustep-base configure again with your CC environment var
|
||||
iable set to $MAKECC" >&5
|
||||
$as_echo "$as_me: WARNING: You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC). To a
|
||||
void conflicts/problems, reconfigure/reinstall gnustep-make to use $CC or run the gnustep-base configure again with your CC environment var
|
||||
iable set to $MAKECC" >&2;}
|
||||
fi
|
||||
fi
|
||||
if test "$CPP" = ""; then
|
||||
CPP=`gnustep-config --variable=CPP`
|
||||
CPP=$MAKECPP
|
||||
else
|
||||
if test "$CPP" != "$MAKECPP"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the preprocessor ($CPP) set to a different value from that used by gnustep-make ($MAKECPP).
|
||||
To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use $CPP or run the gnustep-base configure again with your CPP environ
|
||||
ment variable set to $MAKECPP" >&5
|
||||
$as_echo "$as_me: WARNING: You are running configure with the preprocessor ($CPP) set to a different value from that used by gnustep-make ($MAKECPP).
|
||||
To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use $CPP or run the gnustep-base configure again with your CPP environ
|
||||
ment variable set to $MAKECPP" >&2;}
|
||||
fi
|
||||
fi
|
||||
if test "$CXX" = ""; then
|
||||
CXX=`gnustep-config --variable=CXX`
|
||||
CXX=$MAKECXX
|
||||
else
|
||||
if test "$CXX" != "$MAKECXX"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the compiler ($CXX) set to a different value from that used by gnustep-make ($MAKECXX). To
|
||||
avoid conflicts/problems, reconfigure/reinstall gnustep-make to use $CXX or run the gnustep-base configure again with your CXX environment
|
||||
variable set to $MAKECXX" >&5
|
||||
$as_echo "$as_me: WARNING: You are running configure with the compiler ($CXX) set to a different value from that used by gnustep-make ($MAKECXX). To
|
||||
avoid conflicts/problems, reconfigure/reinstall gnustep-make to use $CXX or run the gnustep-base configure again with your CXX environment
|
||||
variable set to $MAKECXX" >&2;}
|
||||
fi
|
||||
fi
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
|
|
@ -3267,12 +3297,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
|
|||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
MAKECC=`gnustep-config --variable=CC`
|
||||
if test "$CC" != "$MAKECC"; then
|
||||
as_fn_error $? "You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC). Please run configure again with your environment set to match your gnustep-make" "$LINENO" 5
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# The following is so that headers and custom libraries
|
||||
# in the GNUstep root are used before the standard ones
|
||||
|
|
|
|||
33
configure.ac
33
configure.ac
|
|
@ -52,24 +52,39 @@ AC_CANONICAL_TARGET([])
|
|||
#--------------------------------------------------------------------
|
||||
# Find the compiler
|
||||
#--------------------------------------------------------------------
|
||||
MAKECC=`gnustep-config --variable=CC`
|
||||
MAKECPP=`gnustep-config --variable=CPP`
|
||||
MAKECXX=`gnustep-config --variable=CXX`
|
||||
if test "$CC" = ""; then
|
||||
CC=`gnustep-config --variable=CC`
|
||||
CC=$MAKECC
|
||||
else
|
||||
if test "$CC" != "$MAKECC"; then
|
||||
AC_MSG_WARN([You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC). To a
|
||||
void conflicts/problems, reconfigure/reinstall gnustep-make to use $CC or run the gnustep-base configure again with your CC environment var
|
||||
iable set to $MAKECC])
|
||||
fi
|
||||
fi
|
||||
if test "$CPP" = ""; then
|
||||
CPP=`gnustep-config --variable=CPP`
|
||||
CPP=$MAKECPP
|
||||
else
|
||||
if test "$CPP" != "$MAKECPP"; then
|
||||
AC_MSG_WARN([You are running configure with the preprocessor ($CPP) set to a different value from that used by gnustep-make ($MAKECPP).
|
||||
To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use $CPP or run the gnustep-base configure again with your CPP environ
|
||||
ment variable set to $MAKECPP])
|
||||
fi
|
||||
fi
|
||||
if test "$CXX" = ""; then
|
||||
CXX=`gnustep-config --variable=CXX`
|
||||
CXX=$MAKECXX
|
||||
else
|
||||
if test "$CXX" != "$MAKECXX"; then
|
||||
AC_MSG_WARN([You are running configure with the compiler ($CXX) set to a different value from that used by gnustep-make ($MAKECXX). To
|
||||
avoid conflicts/problems, reconfigure/reinstall gnustep-make to use $CXX or run the gnustep-base configure again with your CXX environment
|
||||
variable set to $MAKECXX])
|
||||
fi
|
||||
fi
|
||||
AC_PROG_CC
|
||||
AC_PROG_CPP
|
||||
|
||||
MAKECC=`gnustep-config --variable=CC`
|
||||
if test "$CC" != "$MAKECC"; then
|
||||
AC_MSG_ERROR([You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC). Please run configure again with your environment set to match your gnustep-make])
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# The following is so that headers and custom libraries
|
||||
# in the GNUstep root are used before the standard ones
|
||||
|
|
|
|||
Loading…
Reference in a new issue