[tor-commits] [tor-browser-build/master] Bug 28238: Use mingw-w64-clang for fxc2

[boklm at torproject.org]

commit 9b4b31f5bacfffb2b35e914fe5535999c7db45e1
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Aug 26 12:24:36 2019 +0000

    Bug 28238: Use mingw-w64-clang for fxc2
---
 projects/firefox/build | 1 -
 projects/fxc2/config   | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 31b812a..1fb4b58 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -40,7 +40,6 @@ EOF
   mkdir -p /var/tmp/dist
   tar -C /var/tmp/dist -xf [% c('input_files_by_name/fxc2') %]
   fxcdir=/var/tmp/dist/fxc2/bin
-  cp $mingwdir/[% c("arch") %]-w64-mingw32/bin/libwinpthread-1.dll $fxcdir
   export PATH="$fxcdir:$PATH"
   # fxc2 requires Wine.
   [% IF c("var/windows-x86_64") %]
diff --git a/projects/fxc2/config b/projects/fxc2/config
index 5cdf03a..4b9f151 100644
--- a/projects/fxc2/config
+++ b/projects/fxc2/config
@@ -1,12 +1,13 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://github.com/mozilla/fxc2.git
-git_hash: 0b800f3e41ed087df6f51f120165f3ccc71cc27c
+git_hash: 5ace4c25b63cb5a83b58a3eae3d36256a6022cde
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 var:
   container:
     use_container: 1
+  compiler: mingw-w64-clang
 
 input_files:
   - project: container-image