[tor-commits] [tor-browser-bundle/master] Bug 22267: fix setup of hardened mingw wrappers

[gk at torproject.org]

commit 2db406eba4657e5876994002070f92ace6d2dcc3
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri May 19 23:33:12 2017 +0200

    Bug 22267: fix setup of hardened mingw wrappers
    
    Add the hardened wrappers to the PATH before running the firefox
    configure script. It seems that the wrappers are not used in the build
    if they were not in the PATH during the configure step.
---
 gitian/descriptors/windows/gitian-firefox.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml
index a83ad5b..f3738eb 100644
--- a/gitian/descriptors/windows/gitian-firefox.yml
+++ b/gitian/descriptors/windows/gitian-firefox.yml
@@ -79,15 +79,16 @@ script: |
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   # Make sure widl is not inserting random timestamps, see #21837.
   export WIDL_TIME_OVERRIDE="0"
-  rm -f configure
-  rm -f js/src/configure
-  make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"
-  find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   #
   mkdir -p ~/build/bin/
   cp ~/build/i686* ~/build/bin/
   export PATH=~/build/bin:$PATH
   #
+  rm -f configure
+  rm -f js/src/configure
+  make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"
+  find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
+  #
   make $MAKEOPTS -f client.mk build
   #
   make -C obj-* package INNER_MAKE_PACKAGE=true