From 5573726a45e835aa0b7ee0b37334e219e74afa57 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 10 Mar 2020 00:23:40 +0000 Subject: [PATCH] Bug 1620980 - Fix Windows artifact builds after bug 1620165. r=froydnj Both Wine and UPX are necessary when doing artifact builds. Differential Revision: https://phabricator.services.mozilla.com/D66136 --HG-- extra : moz-landing-system : lando --- build/moz.configure/windows.configure | 2 -- moz.configure | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure index 5eb5fc36cfe6..ddee128a7517 100644 --- a/build/moz.configure/windows.configure +++ b/build/moz.configure/windows.configure @@ -495,5 +495,3 @@ add_old_configure_assignment('LINKER', link) check_prog('MAKECAB', ('makecab.exe',), allow_missing=True, when=target_is_windows) - -check_prog('UPX', ('upx',), allow_missing=True, when=target_is_windows) diff --git a/moz.configure b/moz.configure index e0c110d64e4f..388b6df7ea9d 100755 --- a/moz.configure +++ b/moz.configure @@ -136,8 +136,8 @@ set_config('MOZ_PGO', depends('MOZ_PGO')(lambda x: bool(x))) wine = check_prog( 'WINE', ['wine64', 'wine'], allow_missing=True, - when=depends(target, host, compile_environment)( - lambda t, h, c: c and t.kernel == 'WINNT' and h.kernel == 'Linux')) + when=depends(target, host)( + lambda t, h: t.kernel == 'WINNT' and h.kernel == 'Linux')) include('build/moz.configure/toolchain.configure', @@ -617,6 +617,7 @@ def nsis_flags(host): set_config('MAKENSISU_FLAGS', nsis_flags) check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows) +check_prog('UPX', ('upx',), allow_missing=True, when=target_is_windows) @depends(host_c_compiler, c_compiler, bindgen_config_paths)