From cec883690949c85c6a88efd0f16023507780541e Mon Sep 17 00:00:00 2001 From: Joey Vagedes Date: Thu, 27 Apr 2023 10:53:06 -0700 Subject: [PATCH] Initial commit --- BaseTools/Edk2ToolsBuild.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BaseTools/Edk2ToolsBuild.py b/BaseTools/Edk2ToolsBuild.py index 0add59b5bb..3eaa02175f 100644 --- a/BaseTools/Edk2ToolsBuild.py +++ b/BaseTools/Edk2ToolsBuild.py @@ -203,6 +203,7 @@ def Go(self): # MU_CHANGE STARTs: Specify target architecture # Note: This HOST_ARCH is in respect to the BUILT base tools, not the host arch where # this script is BUILDING the base tools. + HostInfo = GetHostInfo() prefix = None TargetInfoArch = None if self.target_arch is not None: @@ -228,11 +229,12 @@ def Go(self): else: TargetInfoArch = "x86" - + else: + self.target_arch = HostInfo.arch + TargetInfoArch = HostInfo.arch # Otherwise, the built binary arch will be consistent with the host system # Added logic to support cross compilation scenarios - HostInfo = GetHostInfo() if TargetInfoArch != HostInfo.arch: # this is defaulting to the version that comes with Ubuntu 20.04 ver = shell_environment.GetBuildVars().GetValue("LIBUUID_VERSION", "2.34")