[tbb-commits] [tor-browser-build/master] Bug 24060: add x86_64 version of msvcr100.dll

[gk at torproject.org]

commit 2393932708eb8090ee17374a78ad7d0c6c31c564
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Nov 7 20:37:46 2017 +0100

    Bug 24060: add x86_64 version of msvcr100.dll
---
 projects/firefox/build  | 3 +++
 projects/firefox/config | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 3806fdf..e506b56 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -120,6 +120,9 @@ make -C obj-* package INNER_MAKE_PACKAGE=true
   rm -f $distdir/Browser/*.chk
 [% END %]
 
+[% IF c("var/windows-x86_64") -%]
+  mv $rootdir/msvcr100-x86_64.dll $rootdir/msvcr100.dll
+[% END -%]
 [% IF c("var/windows") %]
   cp -a obj-*/dist/firefox/* $distdir/Browser/
   cp -a $rootdir/msvcr100.dll $distdir/Browser
diff --git a/projects/firefox/config b/projects/firefox/config
index 2e30001..f7a143d 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -87,7 +87,10 @@ input_files:
     enable: '[% c("var/linux") || c("var/osx") %]'
   - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll
     sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18
-    enable: '[% c("var/windows") %]'
+    enable: '[% c("var/windows-i686") %]'
+  - URL: https://people.torproject.org/~boklm/mirrors/sources/msvcr100-x86_64.dll
+    sha256sum: ae3cb6c6afba9a4aa5c85f66023c35338ca579b30326dd02918f9d55259503d5
+    enable: '[% c("var/windows-x86_64") %]'
   - project: gcc
     name: gcc
     enable: '[% c("var/windows") %]'