wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1142420 - Require that the same compiler version be used for C and C++ (at the very least, so that our version checks are valid for both). r=glandium

Browse Source 
I tested locally that both checks give the expected error if I
temporarily change the != to an =.
This commit is contained in:
L. David Baron 2015-03-12 23:28:55 -07:00
parent ca883cf28c
commit 6a329cb271
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/autoconf/toolchain.m4
View File

@ -34,6 +34,12 @@ EOF
if test "$compiler" != "$cxxcompiler"; then
AC_MSG_ERROR([Your C and C++ compilers are different. You need to use the same compiler.])
fi
if test "$CC_VERSION" != "$CXX_VERSION"; then
# This may not be strictly necessary, but if we want to drop it, we
# should make sure any version checks below apply to both the C and
# C++ compiler versions.
AC_MSG_ERROR([Your C and C++ compiler versions are different. You need to use the same compiler version.])
fi
CC_VERSION=`echo "$CC_VERSION" | sed 's/ //g'`
CXX_VERSION=`echo "$CXX_VERSION" | sed 's/ //g'`
if test "$compiler" = "gcc"; then
@ -238,6 +244,12 @@ EOF
if test "$host_compiler" != "$host_cxxcompiler"; then
AC_MSG_ERROR([Your C and C++ host compilers are different. You need to use the same compiler.])
fi
if test "$HOST_CC_VERSION" != "$HOST_CXX_VERSION"; then
# This may not be strictly necessary, but if we want to drop it,
# we should make sure any version checks below apply to both the
# C and C++ compiler versions.
AC_MSG_ERROR([Your C and C++ host compiler versions are different. You need to use the same compiler version.])
fi
if test -n "$host_compiler"; then
if test "$host_compiler" = "GCC" ; then
changequote(<<,>>)