commit 74e8c6a9803cc778b73dfa08c23ab7c75bb40718 Author: Sukhbir Singh sukhbir@torproject.org Date: Mon May 28 11:05:32 2018 -0400

Use mach configure to pass build configuration arguments --- projects/firefox/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build index cfef91d..7f74c9c 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -111,10 +111,10 @@ fi

rm -f configure rm -f js/src/configure -make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts"

-make -j[% c("buildconf/num_procs") %] -f client.mk build -make -C obj-* package INNER_MAKE_PACKAGE=true +./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts +./mach build +./mach package

[% IF c("var/osx") %] cp -a obj-macos/dist/firefox/* $distdir