Browse Source

fixed in bug 1832573

Bill Gianopoulos 1 year ago
parent
commit
927d60a34c
1 changed files with 0 additions and 82 deletions
  1. 0 82
      mozilla-central/patches/1624546-vs2019-runtime-mc.patch

+ 0 - 82
mozilla-central/patches/1624546-vs2019-runtime-mc.patch

@@ -1,82 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# 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
-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
-@@ -107,18 +107,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.
- 
--        MSVC_C_RUNTIME_DLL=vcruntime140.dll
--        MSVC_CXX_RUNTIME_DLL=msvcp140.dll
-+        MSVC_C_RUNTIME_DLL=vcruntime140*.dll
-+        MSVC_CXX_RUNTIME_DLL=msvcp140*.dll
- 
-         # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
-         CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"
- 
-         AC_SUBST(MSVC_C_RUNTIME_DLL)
-         AC_SUBST(MSVC_CXX_RUNTIME_DLL)
- 
-         CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
-diff --git a/old-configure.in b/old-configure.in
---- a/old-configure.in
-+++ b/old-configure.in
-@@ -96,18 +96,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.
- 
--        MSVC_C_RUNTIME_DLL=vcruntime140.dll
--        MSVC_CXX_RUNTIME_DLL=msvcp140.dll
-+        MSVC_C_RUNTIME_DLL=vcruntime140*.dll
-+        MSVC_CXX_RUNTIME_DLL=msvcp140*.dll
- 
-         # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
-         CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"
- 
-         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
-diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
---- a/toolkit/mozapps/installer/upload-files.mk
-+++ b/toolkit/mozapps/installer/upload-files.mk
-@@ -60,20 +60,20 @@ ifndef MOZ_SYSTEM_NSPR
-       $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
-       $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
-       $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
-       $(NULL)
-   endif # MOZ_FOLD_LIBS
- endif # MOZ_SYSTEM_NSPR
- 
- ifdef MSVC_C_RUNTIME_DLL
--  JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL)
-+  JSSHELL_BINS += $(notdir $(wildcard $(DIST)/bin/$(MSVC_C_RUNTIME_DLL)))
- endif
- ifdef MSVC_CXX_RUNTIME_DLL
--  JSSHELL_BINS += $(MSVC_CXX_RUNTIME_DLL)
-+  JSSHELL_BINS += $(notdir $(wildcard $(DIST)/bin/$(MSVC_CXX_RUNTIME_DLL)))
- endif
- 
- ifdef WIN_UCRT_REDIST_DIR
-   JSSHELL_BINS += $(notdir $(wildcard $(DIST)/bin/api-ms-win-*.dll))
-   JSSHELL_BINS += ucrtbase.dll
- endif
- 
- ifdef LLVM_SYMBOLIZER