Bug 1415470 - build: Remove always-true version check for VS >= 2015. r?glandium
MozReview-Commit-ID: 1e4Xsw3U3LR
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -175,32 +175,29 @@ case "$target" in
changequote([,])
_MSC_VER=`echo ${CC_VERSION} | cut -c 1-2,4-5`
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
AC_DEFINE(_USE_MATH_DEFINES) # Otherwise MSVC's math.h doesn't #define M_PI.
- case "$CC_VERSION" in
- 19*)
- _CC_SUITE=14
- MSVC_C_RUNTIME_DLL=vcruntime140.dll
- MSVC_CXX_RUNTIME_DLL=msvcp140.dll
+ _CC_SUITE=14
+ MSVC_C_RUNTIME_DLL=vcruntime140.dll
+ MSVC_CXX_RUNTIME_DLL=msvcp140.dll
+
+ # C5026: move constructor was implicitly defined as deleted
+ CXXFLAGS="$CXXFLAGS -wd5026"
- # C5026: move constructor was implicitly defined as deleted
- CXXFLAGS="$CXXFLAGS -wd5026"
+ # C5027: move assignment operator was implicitly defined as deleted
+ CXXFLAGS="$CXXFLAGS -wd5027"
- # C5027: move assignment operator was implicitly defined as deleted
- CXXFLAGS="$CXXFLAGS -wd5027"
+ # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
+ CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"
- # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
- CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"
- ;;
- esac
AC_SUBST(MSVC_C_RUNTIME_DLL)
AC_SUBST(MSVC_CXX_RUNTIME_DLL)
# Check linker version
_LD_FULL_VERSION=`"${LINK}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"`
_LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'`
if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then
AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.])
--- a/old-configure.in
+++ b/old-configure.in
@@ -178,55 +178,52 @@ case "$target" in
changequote([,])
_MSC_VER=`echo ${CC_VERSION} | cut -c 1-2,4-5`
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
AC_DEFINE(_USE_MATH_DEFINES) # Otherwise MSVC's math.h doesn't #define M_PI.
- case "$CC_VERSION" in
- 19*)
- _CC_SUITE=14
- MSVC_C_RUNTIME_DLL=vcruntime140.dll
- MSVC_CXX_RUNTIME_DLL=msvcp140.dll
-
- MOZ_CHECK_HEADER(dia2.h, MSVC_HAS_DIA_SDK=1)
- if test -n "$MSVC_HAS_DIA_SDK"; then
- AC_DEFINE(MSVC_HAS_DIA_SDK)
- fi
-
- # C5026: move constructor was implicitly defined as deleted
- CXXFLAGS="$CXXFLAGS -wd5026"
-
- # C5027: move assignment operator was implicitly defined as deleted
- CXXFLAGS="$CXXFLAGS -wd5027"
-
- # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
- CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"
-
- # https://connect.microsoft.com/VisualStudio/feedback/details/888527/warnings-on-dbghelp-h
- # for dbghelp.h, imagehlp.h, and shobj.h
- # C4091: 'typedef ': ignored on left of '' when no variable is declared
- CFLAGS="$CFLAGS -wd4091"
- CXXFLAGS="$CXXFLAGS -wd4091"
-
- # This is intended as a temporary hack to support building with VS2015.
- # 'noexcept' used with no exception handling mode specified;
- # termination on exception is not guaranteed. Specify /EHsc
- CXXFLAGS="$CXXFLAGS -wd4577"
-
- if test -n "$WIN_UCRT_REDIST_DIR"; then
- if test ! -d "$WIN_UCRT_REDIST_DIR"; then
- AC_MSG_ERROR([Invalid Windows UCRT Redist directory: ${WIN_UCRT_REDIST_DIR}])
- fi
- WIN_UCRT_REDIST_DIR=`cd "$WIN_UCRT_REDIST_DIR" && pwd -W`
- fi
- ;;
- esac
+ _CC_SUITE=14
+ MSVC_C_RUNTIME_DLL=vcruntime140.dll
+ MSVC_CXX_RUNTIME_DLL=msvcp140.dll
+
+ MOZ_CHECK_HEADER(dia2.h, MSVC_HAS_DIA_SDK=1)
+ if test -n "$MSVC_HAS_DIA_SDK"; then
+ AC_DEFINE(MSVC_HAS_DIA_SDK)
+ fi
+
+ # C5026: move constructor was implicitly defined as deleted
+ CXXFLAGS="$CXXFLAGS -wd5026"
+
+ # C5027: move assignment operator was implicitly defined as deleted
+ CXXFLAGS="$CXXFLAGS -wd5027"
+
+ # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
+ CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"
+
+ # https://connect.microsoft.com/VisualStudio/feedback/details/888527/warnings-on-dbghelp-h
+ # for dbghelp.h, imagehlp.h, and shobj.h
+ # C4091: 'typedef ': ignored on left of '' when no variable is declared
+ CFLAGS="$CFLAGS -wd4091"
+ CXXFLAGS="$CXXFLAGS -wd4091"
+
+ # This is intended as a temporary hack to support building with VS2015.
+ # 'noexcept' used with no exception handling mode specified;
+ # termination on exception is not guaranteed. Specify /EHsc
+ CXXFLAGS="$CXXFLAGS -wd4577"
+
+ if test -n "$WIN_UCRT_REDIST_DIR"; then
+ if test ! -d "$WIN_UCRT_REDIST_DIR"; then
+ AC_MSG_ERROR([Invalid Windows UCRT Redist directory: ${WIN_UCRT_REDIST_DIR}])
+ fi
+ WIN_UCRT_REDIST_DIR=`cd "$WIN_UCRT_REDIST_DIR" && pwd -W`
+ fi
+
AC_SUBST(MSVC_HAS_DIA_SDK)
AC_SUBST(MSVC_C_RUNTIME_DLL)
AC_SUBST(MSVC_CXX_RUNTIME_DLL)
AC_DEFINE(HAVE_SEH_EXCEPTIONS)
if test -n "$WIN32_REDIST_DIR"; then
if test ! -d "$WIN32_REDIST_DIR"; then