ArmPlatformPkg/Documentation/patches/BaseTools-Define-the-CodeSourcery-toolchain-path-with-ENV.patch

   1 From fc42aa2804b459c0131cab10803c69e88cc79fc0 Mon Sep 17 00:00:00 2001
   2 From: Olivier Martin <olivier.martin@arm.com>
   3 Date: Wed, 15 Jun 2011 19:24:52 +0100
   4 Subject: [PATCH] BaseTools: Define the CodeSourcery toolchain path with the macro ENV()
   5
   6 The path was defined by the macro DEF() that requires a local definition in the file.
   7 ---
   8  BaseTools/Conf/tools_def.template |   20 ++++++++++----------
   9  1 files changed, 10 insertions(+), 10 deletions(-)
  10  mode change 100644 => 100755 BaseTools/Conf/tools_def.template
  11
  12 diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
  13 old mode 100644
  14 new mode 100755
  15 index 495f55d..7629701
  16 --- a/BaseTools/Conf/tools_def.template
  17 +++ b/BaseTools/Conf/tools_def.template
  18 @@ -3560,7 +3560,7 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
  19  *_ARMGCC_*_*_FAMILY          = GCC
  20  *_ARMGCC_*_*_BUILDRULEFAMILY = ARMGCC
  21
  22 -*_ARMGCC_*_MAKE_PATH         = DEF(SOURCERY_TOOLS)/cs-make
  23 +*_ARMGCC_*_MAKE_PATH         = make
  24  *_ARMGCC_*_MAKE_FLAGS        = --no-print-directory
  25
  26  ##################
  27 @@ -3577,16 +3577,16 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
  28  # ARM definitions
  29  ##################
  30
  31 -*_ARMGCC_ARM_ASLCC_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
  32 -*_ARMGCC_ARM_ASLDLINK_PATH   = DEF(SOURCERY_TOOLS)/arm-none-eabi-ld
  33 -*_ARMGCC_ARM_ASLPP_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
  34 +*_ARMGCC_ARM_ASLCC_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
  35 +*_ARMGCC_ARM_ASLDLINK_PATH   = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld
  36 +*_ARMGCC_ARM_ASLPP_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
  37
  38 -*_ARMGCC_ARM_CC_PATH         = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
  39 -*_ARMGCC_ARM_SLINK_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-ar
  40 -*_ARMGCC_ARM_DLINK_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-ld
  41 -*_ARMGCC_ARM_ASM_PATH        = DEF(SOURCERY_TOOLS)/arm-none-eabi-as
  42 -*_ARMGCC_ARM_PP_PATH         = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
  43 -*_ARMGCC_ARM_VFRPP_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
  44 +*_ARMGCC_ARM_CC_PATH         = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
  45 +*_ARMGCC_ARM_SLINK_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ar
  46 +*_ARMGCC_ARM_DLINK_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld
  47 +*_ARMGCC_ARM_ASM_PATH        = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-as
  48 +*_ARMGCC_ARM_PP_PATH         = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
  49 +*_ARMGCC_ARM_VFRPP_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
  50
  51  #
  52  # Use default values, or override in DSC file
  53 --
  54 1.6.3.3
  55