Backed out changeset 2d2e184a0ae9 (bug 1617801) for causing Windows bustages CLOSED TREE

build/moz.configure/windows.configure

@@ -489,5 +489,3 @@ add_old_configure_assignment('LINKER', link)
 
 
 check_prog('MAKECAB', ('makecab.exe',), when=host_is_windows)
-
-check_prog('UPX', ('upx',), allow_missing=True, when=target_is_windows)

python/mozbuild/mozbuild/action/exe_7z_archive.py

@@ -22,13 +22,7 @@ def archive_exe(pkg_dir, tagfile, sfx_package, package, use_upx):
 
         if use_upx:
             final_sfx = mozpath.join(tmpdir, '7zSD.sfx')
-            subprocess.check_call([
-                buildconfig.substs['UPX'],
-                '--best',
-                '-o',
-                final_sfx,
-                sfx_package,
-            ])
+            subprocess.check_call(['upx', '--best', '-o', final_sfx, sfx_package])
         else:
             final_sfx = sfx_package
 

toolkit/mozapps/installer/windows/nsis/makensis.mk

@@ -13,10 +13,8 @@ SFX_MODULE ?= $(error SFX_MODULE is not defined)
 ifeq ($(CPU_ARCH), aarch64)
 USE_UPX := 
 else
-ifneq (,$(UPX)$(MOZ_AUTOMATION))
 USE_UPX := --use-upx
 endif
-endif
 
 TOOLKIT_NSIS_FILES = \
 	common.nsh \