bustage fix backing out 214597 fix
git-svn-id: svn://10.0.0.236/trunk@145432 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
4
mozilla/configure
vendored
4
mozilla/configure
vendored
@@ -2622,10 +2622,10 @@ cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
|
||||
# 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 }'`
|
||||
|
||||
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 }'`
|
||||
|
||||
if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then
|
||||
|
||||
@@ -327,10 +327,10 @@ case "$target" in
|
||||
AC_LANG_RESTORE
|
||||
|
||||
# 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 }'`
|
||||
|
||||
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 }'`
|
||||
|
||||
if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then
|
||||
|
||||
Reference in New Issue
Block a user