Temp fix - Bug 1624546 - Include vcruntime140_1.dll for VS2019 16.5 x…

…64 from the redist directory in the package. r=dmajor
BrowserWorks · Nov 19, 2020 · f13e15f · f13e15f
1 parent 3cb9234
commit f13e15f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
@@ -137,8 +137,8 @@ case "$target" in
         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
+        MSVC_CXX_RUNTIME_DLL=msvcp140*.dll
 
         # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
         CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"

diff --git a/old-configure.in b/old-configure.in
@@ -150,8 +150,8 @@ case "$target" in
         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
+        MSVC_CXX_RUNTIME_DLL=msvcp140*.dll
 
         # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
         CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"

diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
@@ -65,10 +65,10 @@ ifndef MOZ_SYSTEM_NSPR
 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