|
|
@@ -1,7 +1,6 @@
|
|
|
# HG changeset patch
|
|
|
# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
|
-# Date 1584995284 -3600
|
|
|
-# Parent 8a7e81984ad3826277ee8b7ef2efc8e6858bc518
|
|
|
+# Date 1639224753 0
|
|
|
Bug 1624546 - Include vcruntime140_1.dll for VS2019 16.5 x64 from the redist directory. r=frg a=frg
|
|
|
|
|
|
Actually include all msvcp140 vcruntime140 DLls in the redist directory to be
|
|
|
@@ -10,15 +9,15 @@ on the safe side.
|
|
|
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
|
|
|
--- a/js/src/old-configure.in
|
|
|
+++ b/js/src/old-configure.in
|
|
|
-@@ -130,18 +130,18 @@ case "$target" in
|
|
|
- _MSVC_VER_FILTER='s|.*[^!-~]([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p'
|
|
|
- changequote([,])
|
|
|
+@@ -125,18 +125,18 @@ case "$target" in
|
|
|
+ [ unsigned *test = new unsigned(42); ],,
|
|
|
+ AC_MSG_ERROR([\$(CXX) test failed. You must have MS VC++ in your path to build.]) )
|
|
|
+ AC_LANG_RESTORE
|
|
|
|
|
|
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.
|
|
|
|
|
|
- _CC_SUITE=14
|
|
|
- MSVC_C_RUNTIME_DLL=vcruntime140.dll
|
|
|
- MSVC_CXX_RUNTIME_DLL=msvcp140.dll
|
|
|
+ MSVC_C_RUNTIME_DLL=vcruntime140*.dll
|
|
|
@@ -30,19 +29,19 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
|
|
|
AC_SUBST(MSVC_C_RUNTIME_DLL)
|
|
|
AC_SUBST(MSVC_CXX_RUNTIME_DLL)
|
|
|
|
|
|
- # Check linker version, except in lld builds
|
|
|
+ CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
|
|
|
diff --git a/old-configure.in b/old-configure.in
|
|
|
--- a/old-configure.in
|
|
|
+++ b/old-configure.in
|
|
|
-@@ -140,18 +140,18 @@ case "$target" in
|
|
|
- _MSVC_VER_FILTER='s|.*[^!-~]([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p'
|
|
|
- changequote([,])
|
|
|
+@@ -135,18 +135,18 @@ case "$target" in
|
|
|
+ [ unsigned *test = new unsigned(42); ],,
|
|
|
+ AC_MSG_ERROR([\$(CXX) test failed. You must have MS VC++ in your path to build.]) )
|
|
|
+ AC_LANG_RESTORE
|
|
|
|
|
|
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.
|
|
|
|
|
|
- _CC_SUITE=14
|
|
|
- MSVC_C_RUNTIME_DLL=vcruntime140.dll
|
|
|
- MSVC_CXX_RUNTIME_DLL=msvcp140.dll
|
|
|
+ MSVC_C_RUNTIME_DLL=vcruntime140*.dll
|
Bill Gianopoulos