From e243dfd12b763f363f5d3b2474efe924867d9e83 Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Wed, 25 Apr 2018 18:11:42 +0800 Subject: [PATCH] BaseTools: Separate HOST and PREFIX env for GCC tool chain The crossing GCC compiler may use the different path for make and gcc tool. So, GCC_HOST_BIN is introduced for make path. GCC5_BIN is still kept for gcc path. User needs to set GCC_HOST_BIN besides set GCC5_BIN env if the default make is not used. Normally, make is in the default system path. GCC_HOST_BIN is not required to be set. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Reviewed-by: Yonghong Zhu Tested-by: Ard Biesheuvel Acked-by: Laszlo Ersek --- BaseTools/Conf/tools_def.template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 03d7000185..10248ed72d 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -209,6 +209,7 @@ DEFINE GCC49_X64_PREFIX = ENV(GCC49_BIN) DEFINE GCC5_IA32_PREFIX = ENV(GCC5_BIN) DEFINE GCC5_X64_PREFIX = ENV(GCC5_BIN) +DEFINE GCC_HOST_PREFIX = ENV(GCC_HOST_BIN) DEFINE UNIX_IASL_BIN = ENV(IASL_PREFIX)iasl DEFINE WIN_IASL_BIN = ENV(IASL_PREFIX)iasl.exe @@ -4788,7 +4789,7 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS) #################################################################################### *_GCC44_*_*_FAMILY = GCC -*_GCC44_*_MAKE_PATH = DEF(GCC44_IA32_PREFIX)make +*_GCC44_*_MAKE_PATH = DEF(GCC_HOST_PREFIX)make *_GCC44_*_*_DLL = ENV(GCC44_DLL) *_GCC44_*_ASL_PATH = DEF(UNIX_IASL_BIN) @@ -4864,7 +4865,7 @@ RELEASE_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS) -Os #################################################################################### *_GCC45_*_*_FAMILY = GCC -*_GCC45_*_MAKE_PATH = DEF(GCC45_IA32_PREFIX)make +*_GCC45_*_MAKE_PATH = DEF(GCC_HOST_PREFIX)make *_GCC45_*_*_DLL = ENV(GCC45_DLL) *_GCC45_*_ASL_PATH = DEF(UNIX_IASL_BIN) @@ -4940,7 +4941,7 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os #################################################################################### *_GCC46_*_*_FAMILY = GCC -*_GCC46_*_MAKE_PATH = DEF(GCC46_IA32_PREFIX)make +*_GCC46_*_MAKE_PATH = DEF(GCC_HOST_PREFIX)make *_GCC46_*_*_DLL = ENV(GCC46_DLL) *_GCC46_*_ASL_PATH = DEF(UNIX_IASL_BIN) @@ -5050,7 +5051,7 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v #################################################################################### *_GCC47_*_*_FAMILY = GCC -*_GCC47_*_MAKE_PATH = DEF(GCC47_IA32_PREFIX)make +*_GCC47_*_MAKE_PATH = DEF(GCC_HOST_PREFIX)make *_GCC47_*_*_DLL = ENV(GCC47_DLL) *_GCC47_*_ASL_PATH = DEF(UNIX_IASL_BIN) @@ -5189,7 +5190,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s #################################################################################### *_GCC48_*_*_FAMILY = GCC -*_GCC48_*_MAKE_PATH = DEF(GCC48_IA32_PREFIX)make +*_GCC48_*_MAKE_PATH = DEF(GCC_HOST_PREFIX)make *_GCC48_*_*_DLL = ENV(GCC48_DLL) *_GCC48_*_ASL_PATH = DEF(UNIX_IASL_BIN) @@ -5328,7 +5329,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s #################################################################################### *_GCC49_*_*_FAMILY = GCC -*_GCC49_*_MAKE_PATH = DEF(GCC49_IA32_PREFIX)make +*_GCC49_*_MAKE_PATH = DEF(GCC_HOST_PREFIX)make *_GCC49_*_*_DLL = ENV(GCC49_DLL) *_GCC49_*_ASL_PATH = DEF(UNIX_IASL_BIN) @@ -5473,7 +5474,7 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS) #################################################################################### *_GCC5_*_*_FAMILY = GCC -*_GCC5_*_MAKE_PATH = DEF(GCC5_IA32_PREFIX)make +*_GCC5_*_MAKE_PATH = DEF(GCC_HOST_PREFIX)make *_GCC5_*_*_DLL = ENV(GCC5_DLL) *_GCC5_*_ASL_PATH = DEF(UNIX_IASL_BIN)