diff --git a/sys-boot/edk2/edk2-2018.recipe b/sys-boot/edk2/edk2-2018.recipe
index 1a8e5996e..ae3792f5c 100644
--- a/sys-boot/edk2/edk2-2018.recipe
+++ b/sys-boot/edk2/edk2-2018.recipe
@@ -25,14 +25,11 @@ CHECKSUM_SHA256="a37aa6dc7a4326b562ce03e225afd96a0cd1dc847d9aeddfd867ce6b2e7cc7b
 SOURCE_DIR="edk2-vUDK$portVersion"
 PATCHES="edk2-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 !x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86"
-DISABLE_SOURCE_PACKAGE="yes"
-
-commandSuffix=$secondaryArchSuffix
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
-	commandSuffix=
+SECONDARY_ARCHITECTURES="?x86"
 fi
+DISABLE_SOURCE_PACKAGE="yes"
 
 PROVIDES="
 	edk2$secondaryArchSuffix = $portVersion compat >= 0
@@ -48,7 +45,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
-	cmd:iasl$commandSuffix
+	cmd:iasl
 	cmd:make
 	cmd:nasm
 	cmd:python2
@@ -76,7 +73,10 @@ PATCH()
 
 BUILD()
 {
-	make -C BaseTools
+	if [ "$effectiveTargetArchitecture" = x86 ]; then
+		HOST_ARCH=IA32
+	fi
+	make -C BaseTools ${HOST_ARCH:+HOST_ARCH=$HOST_ARCH}
 	. ./edksetup.sh
 	local EDK_TOOLS_PATH="$sourceDir"/BaseTools
 	. ./edksetup.sh BaseTools