From f13e15f0285a4b59ceed808ad9552026e4015ab5 Mon Sep 17 00:00:00 2001
From: Alex Kontos <alex@waterfoxproject.org>
Date: Thu, 19 Nov 2020 20:14:33 +0000
Subject: [PATCH] Temp fix - Bug 1624546 - Include vcruntime140_1.dll for
 VS2019 16.5 x64 from the redist directory in the package. r=dmajor

---
 js/src/old-configure.in                   | 4 ++--
 old-configure.in                          | 4 ++--
 toolkit/mozapps/installer/upload-files.mk | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 5423509e291af..254f3969735e4 100644
--- 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
index d87e68ee8de32..649dfde1a3ebe 100644
--- 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
index ee08995ae92b6..a738148fa0f68 100644
--- 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