Merging uefi-next/linaro-release into masterlinaro-uefi-2013.06

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

1 files changed, 10 insertions, 10 deletions

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 8e3053dc2..6756002e2 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -4894,16 +4894,16 @@ RELEASE_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_F
 # ARM definitions

 ##################

 

-*_ARMGCC_ARM_ASLCC_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc

-*_ARMGCC_ARM_ASLDLINK_PATH   = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld

-*_ARMGCC_ARM_ASLPP_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc

-

-*_ARMGCC_ARM_CC_PATH         = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc

-*_ARMGCC_ARM_SLINK_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ar

-*_ARMGCC_ARM_DLINK_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld

-*_ARMGCC_ARM_ASM_PATH        = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-as

-*_ARMGCC_ARM_PP_PATH         = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc

-*_ARMGCC_ARM_VFRPP_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc

+*_ARMGCC_ARM_ASLCC_PATH      = ENV(CROSS_COMPILE)gcc

+*_ARMGCC_ARM_ASLDLINK_PATH   = ENV(CROSS_COMPILE)ld

+*_ARMGCC_ARM_ASLPP_PATH      = ENV(CROSS_COMPILE)gcc

+

+*_ARMGCC_ARM_CC_PATH         = ENV(CROSS_COMPILE)gcc

+*_ARMGCC_ARM_SLINK_PATH      = ENV(CROSS_COMPILE)ar

+*_ARMGCC_ARM_DLINK_PATH      = ENV(CROSS_COMPILE)ld

+*_ARMGCC_ARM_ASM_PATH        = ENV(CROSS_COMPILE)as

+*_ARMGCC_ARM_PP_PATH         = ENV(CROSS_COMPILE)gcc

+*_ARMGCC_ARM_VFRPP_PATH      = ENV(CROSS_COMPILE)gcc

 

 #

 # Use default values, or override in DSC file