Bug 1807779 - Stop requiring to set WINEPATH manually when cross-compiling for arm64 windows. r=firefox-build-system-reviewers,ahochheiden

Differential Revision: https://phabricator.services.mozilla.com/D165588

browser/config/mozconfigs/win64-aarch64/common-win64

@@ -13,7 +13,6 @@ if [ -f "${UPX}" ]; then
     chmod +x "${UPX}"
 fi
 mk_add_options "export PATH=${VC_PATH}/bin/hostx64/arm64:${PATH}"
-mk_add_options "export WINEPATH=${VC_PATH}/bin/hostx64/x64"
 
 unset VC_PATH
 

config/rules.mk

@@ -607,6 +607,12 @@ else
 relativize = $1
 endif
 
+ifdef WINE
+# asmarm64 needs a library that can be found in $PATH but for some reason,
+# wine wants its path in $WINEPATH, so fill that to make it happy.
+$(ASOBJS) $(SOBJS): export WINEPATH=$(subst :,;,$(PATH))
+endif
+
 ifdef ASFILES
 # The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept
 # a '-c' flag.