mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-04 21:18:35 +00:00
bustage fix backing out 214597 fix
This commit is contained in:
parent
2832eb9405
commit
a1e75e8d7c
4
configure
vendored
4
configure
vendored
@ -2622,10 +2622,10 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||||||
|
|
||||||
|
|
||||||
# Determine compiler version
|
# Determine compiler version
|
||||||
CC_VERSION=`"${CC}" -v 2>&1 | grep -i version | sed -e 's|.* vVersion ||' | sed -e 's| *$||'`
|
CC_VERSION=`"${CC}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's| *$||'`
|
||||||
_CC_MAJOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $ 1 }'`
|
_CC_MAJOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $ 1 }'`
|
||||||
|
|
||||||
CXX_VERSION=`"${CXX}" -v 2>&1 | grep -i version | sed -e 's|.* vVersion ||' | sed -e 's| *$||'`
|
CXX_VERSION=`"${CXX}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's| *$||'`
|
||||||
_CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | awk -F\. '{ print $ 1 }'`
|
_CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | awk -F\. '{ print $ 1 }'`
|
||||||
|
|
||||||
if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then
|
if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then
|
||||||
|
@ -327,10 +327,10 @@ case "$target" in
|
|||||||
AC_LANG_RESTORE
|
AC_LANG_RESTORE
|
||||||
|
|
||||||
# Determine compiler version
|
# Determine compiler version
|
||||||
CC_VERSION=`"${CC}" -v 2>&1 | grep -i version | sed -e 's|.* [vV]ersion ||' | sed -e 's|[ ]*$||'`
|
CC_VERSION=`"${CC}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's|[ ]*$||'`
|
||||||
_CC_MAJOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $ 1 }'`
|
_CC_MAJOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $ 1 }'`
|
||||||
|
|
||||||
CXX_VERSION=`"${CXX}" -v 2>&1 | grep -i version | sed -e 's|.* [vV]ersion ||' | sed -e 's|[ ]*$||'`
|
CXX_VERSION=`"${CXX}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's|[ ]*$||'`
|
||||||
_CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | awk -F\. '{ print $ 1 }'`
|
_CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | awk -F\. '{ print $ 1 }'`
|
||||||
|
|
||||||
if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then
|
if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user