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 <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 03d70001855016130b0431b1c50c23d2715f5d2a..10248ed72d183c324465dab3932cdd9c48e76dd9 100755 (executable)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -209,6 +209,7 @@ DEFINE GCC49_X64_PREFIX        = ENV(GCC49_BIN)
 \r
 DEFINE GCC5_IA32_PREFIX        = ENV(GCC5_BIN)\r
 DEFINE GCC5_X64_PREFIX         = ENV(GCC5_BIN)\r
 \r
 DEFINE GCC5_IA32_PREFIX        = ENV(GCC5_BIN)\r
 DEFINE GCC5_X64_PREFIX         = ENV(GCC5_BIN)\r

+DEFINE GCC_HOST_PREFIX         = ENV(GCC_HOST_BIN)\r

 \r
 DEFINE UNIX_IASL_BIN           = ENV(IASL_PREFIX)iasl\r
 DEFINE WIN_IASL_BIN            = ENV(IASL_PREFIX)iasl.exe\r
 \r
 DEFINE UNIX_IASL_BIN           = ENV(IASL_PREFIX)iasl\r
 DEFINE WIN_IASL_BIN            = ENV(IASL_PREFIX)iasl.exe\r


@@ -4788,7 +4789,7 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS   = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)
 ####################################################################################\r
 *_GCC44_*_*_FAMILY               = GCC\r
 \r
 ####################################################################################\r
 *_GCC44_*_*_FAMILY               = GCC\r
 \r

-*_GCC44_*_MAKE_PATH                    = DEF(GCC44_IA32_PREFIX)make\r
+*_GCC44_*_MAKE_PATH                    = DEF(GCC_HOST_PREFIX)make\r

 *_GCC44_*_*_DLL                        = ENV(GCC44_DLL)\r
 *_GCC44_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r
 *_GCC44_*_*_DLL                        = ENV(GCC44_DLL)\r
 *_GCC44_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r


@@ -4864,7 +4865,7 @@ RELEASE_GCC44_X64_CC_FLAGS       = DEF(GCC44_X64_CC_FLAGS) -Os
 ####################################################################################\r
 *_GCC45_*_*_FAMILY               = GCC\r
 \r
 ####################################################################################\r
 *_GCC45_*_*_FAMILY               = GCC\r
 \r

-*_GCC45_*_MAKE_PATH                    = DEF(GCC45_IA32_PREFIX)make\r
+*_GCC45_*_MAKE_PATH                    = DEF(GCC_HOST_PREFIX)make\r

 *_GCC45_*_*_DLL                        = ENV(GCC45_DLL)\r
 *_GCC45_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r
 *_GCC45_*_*_DLL                        = ENV(GCC45_DLL)\r
 *_GCC45_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r


@@ -4940,7 +4941,7 @@ RELEASE_GCC45_X64_CC_FLAGS       = DEF(GCC45_X64_CC_FLAGS) -Os
 ####################################################################################\r
 *_GCC46_*_*_FAMILY               = GCC\r
 \r
 ####################################################################################\r
 *_GCC46_*_*_FAMILY               = GCC\r
 \r

-*_GCC46_*_MAKE_PATH                    = DEF(GCC46_IA32_PREFIX)make\r
+*_GCC46_*_MAKE_PATH                    = DEF(GCC_HOST_PREFIX)make\r

 *_GCC46_*_*_DLL                        = ENV(GCC46_DLL)\r
 *_GCC46_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r
 *_GCC46_*_*_DLL                        = ENV(GCC46_DLL)\r
 *_GCC46_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r


@@ -5050,7 +5051,7 @@ RELEASE_GCC46_ARM_CC_FLAGS       = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v
 ####################################################################################\r
 *_GCC47_*_*_FAMILY               = GCC\r
 \r
 ####################################################################################\r
 *_GCC47_*_*_FAMILY               = GCC\r
 \r

-*_GCC47_*_MAKE_PATH                    = DEF(GCC47_IA32_PREFIX)make\r
+*_GCC47_*_MAKE_PATH                    = DEF(GCC_HOST_PREFIX)make\r

 *_GCC47_*_*_DLL                        = ENV(GCC47_DLL)\r
 *_GCC47_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r
 *_GCC47_*_*_DLL                        = ENV(GCC47_DLL)\r
 *_GCC47_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r


@@ -5189,7 +5190,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS   = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
 ####################################################################################\r
 *_GCC48_*_*_FAMILY               = GCC\r
 \r
 ####################################################################################\r
 *_GCC48_*_*_FAMILY               = GCC\r
 \r

-*_GCC48_*_MAKE_PATH                    = DEF(GCC48_IA32_PREFIX)make\r
+*_GCC48_*_MAKE_PATH                    = DEF(GCC_HOST_PREFIX)make\r

 *_GCC48_*_*_DLL                        = ENV(GCC48_DLL)\r
 *_GCC48_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r
 *_GCC48_*_*_DLL                        = ENV(GCC48_DLL)\r
 *_GCC48_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r


@@ -5328,7 +5329,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS   = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
 ####################################################################################\r
 *_GCC49_*_*_FAMILY               = GCC\r
 \r
 ####################################################################################\r
 *_GCC49_*_*_FAMILY               = GCC\r
 \r

-*_GCC49_*_MAKE_PATH                    = DEF(GCC49_IA32_PREFIX)make\r
+*_GCC49_*_MAKE_PATH                    = DEF(GCC_HOST_PREFIX)make\r

 *_GCC49_*_*_DLL                        = ENV(GCC49_DLL)\r
 *_GCC49_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r
 *_GCC49_*_*_DLL                        = ENV(GCC49_DLL)\r
 *_GCC49_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r


@@ -5473,7 +5474,7 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS  = DEF(GCC49_AARCH64_DLINK_FLAGS)
 ####################################################################################\r
 *_GCC5_*_*_FAMILY                = GCC\r
 \r
 ####################################################################################\r
 *_GCC5_*_*_FAMILY                = GCC\r
 \r

-*_GCC5_*_MAKE_PATH               = DEF(GCC5_IA32_PREFIX)make\r
+*_GCC5_*_MAKE_PATH               = DEF(GCC_HOST_PREFIX)make\r

 *_GCC5_*_*_DLL                   = ENV(GCC5_DLL)\r
 *_GCC5_*_ASL_PATH                = DEF(UNIX_IASL_BIN)\r
 \r
 *_GCC5_*_*_DLL                   = ENV(GCC5_DLL)\r
 *_GCC5_*_ASL_PATH                = DEF(UNIX_IASL_BIN)\r
 \r