[tor-commits] [tor-browser-build/master] Bug 26203: Update mozconfig for Windows nightly build

[gk at torproject.org]

commit 656090e748599053adfb9d0c31b6955ba7ef8129
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Tue Jun 12 22:04:06 2018 -0400

    Bug 26203: Update mozconfig for Windows nightly build
    
    Also enable rust for all builds.
---
 projects/firefox/build                    | 8 +++-----
 projects/firefox/config                   | 1 -
 projects/firefox/mozconfig-windows-i686   | 3 +++
 projects/firefox/mozconfig-windows-x86_64 | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 81032c6..09620ae 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -65,11 +65,9 @@ EOF
   export SELFRANDO_skip_shuffle=
 [% END -%]
 
-[% IF ! c("var/windows") %]
-  mkdir -p /var/tmp/dist
-  tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]
-  export PATH="/var/tmp/dist/rust/bin:$PATH"
-[% END -%]
+mkdir -p /var/tmp/dist
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]
+export PATH="/var/tmp/dist/rust/bin:$PATH"
 
 [% IF c("var/linux") %]
   # Add llvm so stylo can build
diff --git a/projects/firefox/config b/projects/firefox/config
index 5bde93d..120ad35 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -108,7 +108,6 @@ input_files:
     enable: '[% c("var/windows-x86_64") %]'
   - project: rust
     name: rust
-    enable: '[% ! c("var/windows") %]'
   - project: llvm
     name: llvm
     enable: '[% c("var/linux") %]'
diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686
index dfb3326..daeaed4 100644
--- a/projects/firefox/mozconfig-windows-i686
+++ b/projects/firefox/mozconfig-windows-i686
@@ -24,3 +24,6 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-webrtc
 ac_add_options --disable-tests
+ac_add_options --disable-stylo # Bugzilla 1390583
+ac_add_options --disable-accessibility # https://sourceforge.net/p/mingw-w64/bugs/648/
+ac_add_options --disable-jemalloc # Bugzilla 1466192
diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64
index 669c124..568d88d 100644
--- a/projects/firefox/mozconfig-windows-x86_64
+++ b/projects/firefox/mozconfig-windows-x86_64
@@ -18,12 +18,12 @@ ac_add_options --enable-tor-browser-update
 ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
-# We can't build the sandbox code with mingw-w64:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1042426
-ac_add_options --disable-sandbox
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 ac_add_options --disable-crashreporter
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-webrtc
 ac_add_options --disable-tests
+ac_add_options --disable-stylo # Bugzilla 1390583
+ac_add_options --disable-accessibility # https://sourceforge.net/p/mingw-w64/bugs/648/
+ac_add_options --disable-jemalloc # Bugzilla 1466192