Bug 508760 - Remove MSVC6 support from the tree; (Av1) configure.in.
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 26 Jan 2010 19:26:21 +0100
changeset 26735 85ba2075840b72d92953077dfd17fdd05f4ba13c
parent 26734 31f97a231f239a09363b8df92655a22c1aa68ddc
child 26736 d17ee097dc0946181e3085634e577c7978581dd6
push id2232
push usersgautherie.bz@free.fr
push dateTue, 26 Jan 2010 18:27:49 +0000
bugs508760
milestone1.9.1.8pre
Bug 508760 - Remove MSVC6 support from the tree; (Av1) configure.in. r=ted.mielczarek a-1.9.1.8=dveditz.
configure.in
js/src/configure.in
--- a/configure.in
+++ b/configure.in
@@ -511,19 +511,17 @@ case "$target" in
         _MSC_VER=${_CC_MAJOR_VERSION}${_CC_MINOR_VERSION}
 
         CXX_VERSION=`"${CXX}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"`
         _CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | $AWK -F\. '{ print $1 }'`
 
         if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then
             AC_MSG_ERROR([The major versions of \$CC and \$CXX do not match.])
         fi
-        if test "$_CC_MAJOR_VERSION" = "12"; then
-            _CC_SUITE=6
-        elif test "$_CC_MAJOR_VERSION" = "13"; then
+        if test "$_CC_MAJOR_VERSION" = "13"; then
             _CC_SUITE=7
         elif test "$_CC_MAJOR_VERSION" = "14"; then
             _CC_SUITE=8
             CXXFLAGS="$CXXFLAGS -Zc:wchar_t-"
             dnl -DYNAMICBASE is only supported on VC8SP1 or newer,
             dnl so be very specific here!
             dnl VC8 is 14.00.50727.42, VC8SP1 is 14.00.50727.762
             if test $_CC_RELEASE -gt 50727; then
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -435,19 +435,17 @@ case "$target" in
         _MSC_VER=${_CC_MAJOR_VERSION}${_CC_MINOR_VERSION}
 
         CXX_VERSION=`"${CXX}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"`
         _CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | $AWK -F\. '{ print $1 }'`
 
         if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then
             AC_MSG_ERROR([The major versions of \$CC and \$CXX do not match.])
         fi
-        if test "$_CC_MAJOR_VERSION" = "12"; then
-            _CC_SUITE=6
-        elif test "$_CC_MAJOR_VERSION" = "13"; then
+        if test "$_CC_MAJOR_VERSION" = "13"; then
             _CC_SUITE=7
         elif test "$_CC_MAJOR_VERSION" = "14"; then
             _CC_SUITE=8
             CXXFLAGS="$CXXFLAGS -Zc:wchar_t-"
             dnl -DYNAMICBASE is only supported on VC8SP1 or newer,
             dnl so be very specific here!
             dnl VC8 is 14.00.50727.42, VC8SP1 is 14.00.50727.762
             if test $_CC_RELEASE -gt 50727; then