summaryrefslogtreecommitdiff
path: root/BaseTools
diff options
context:
space:
mode:
authorSteven Kinney <steven.kinney@linaro.org>2013-12-05 17:24:04 -0600
committerSteven Kinney <steven.kinney@linaro.org>2013-12-05 17:24:04 -0600
commitb9a23442d89cfb8a0c26859ec513412677c14acb (patch)
treedbe439276257d9f6e7feb40be9ad0b39d020c3bc /BaseTools
parent1880b54be20dcea943ddc7186cc189888644bc72 (diff)
parente1debc532fe41eac7281d0e8d19d91aa0ba0ffb4 (diff)
Merge branch 'linaro-topic-fvp' into linaro-tracking-2013.12
Diffstat (limited to 'BaseTools')
-rw-r--r--BaseTools/Conf/tools_def.template20
1 files changed, 10 insertions, 10 deletions
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index c5306592d..1db971950 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -5668,16 +5668,16 @@ RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM
######################
# AARCH64 64bit ARM GNU/Linux GCC (ARM Architecture 64)
-*_ARMLINUXGCC_AARCH64_ASLCC_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc
-*_ARMLINUXGCC_AARCH64_ASLDLINK_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ld
-*_ARMLINUXGCC_AARCH64_ASLPP_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc
-
-*_ARMLINUXGCC_AARCH64_CC_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc
-*_ARMLINUXGCC_AARCH64_SLINK_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ar
-*_ARMLINUXGCC_AARCH64_DLINK_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ld
-*_ARMLINUXGCC_AARCH64_ASM_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-as
-*_ARMLINUXGCC_AARCH64_PP_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc
-*_ARMLINUXGCC_AARCH64_VFRPP_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc
+*_ARMLINUXGCC_AARCH64_ASLCC_PATH = ENV(CROSS_COMPILE)gcc
+*_ARMLINUXGCC_AARCH64_ASLDLINK_PATH = ENV(CROSS_COMPILE)ld
+*_ARMLINUXGCC_AARCH64_ASLPP_PATH = ENV(CROSS_COMPILE)gcc
+
+*_ARMLINUXGCC_AARCH64_CC_PATH = ENV(CROSS_COMPILE)gcc
+*_ARMLINUXGCC_AARCH64_SLINK_PATH = ENV(CROSS_COMPILE)ar
+*_ARMLINUXGCC_AARCH64_DLINK_PATH = ENV(CROSS_COMPILE)ld
+*_ARMLINUXGCC_AARCH64_ASM_PATH = ENV(CROSS_COMPILE)as
+*_ARMLINUXGCC_AARCH64_PP_PATH = ENV(CROSS_COMPILE)gcc
+*_ARMLINUXGCC_AARCH64_VFRPP_PATH = ENV(CROSS_COMPILE)gcc
#
# Use default values, or override in DSC file