Merged in #328 to feature/hal, and added GCC_ARM_PATH for embedXCode.

build/arm-tools.mk

@@ -2,8 +2,9 @@
 # Define ARM tools
 #
 
+
 # Define the compiler/tools prefix
-GCC_PREFIX = arm-none-eabi-
+GCC_PREFIX ?= arm-none-eabi-
 
 include $(COMMON_BUILD)/common-tools.mk
 

build/common-tools.mk

@@ -3,12 +3,17 @@ RM = rm -f
 RMDIR = rm -f -r
 MKDIR = mkdir -p
 
-CC = $(GCC_PREFIX)gcc
-CPP = $(GCC_PREFIX)g++
-AR = $(GCC_PREFIX)ar
-OBJCOPY = $(GCC_PREFIX)objcopy
-OBJDUMP = $(GCC_PREFIX)objdump
-SIZE = $(GCC_PREFIX)size
+# GCC_ARM_PATH can be defined to be the path of the GCC ARM compiler,
+# It must include a final slash! Default is empty
+# GCC_PREFIX can be set to the prefix added to GCC ARM names. 
+# Default is arm-none-eabi-
+
+CC = $(GCC_ARM_PATH)$(GCC_PREFIX)gcc
+CPP = $(GCC_ARM_PATH)$(GCC_PREFIX)g++
+AR = $(GCC_ARM_PATH)$(GCC_PREFIX)ar
+OBJCOPY = $(GCC_ARM_PATH)$(GCC_PREFIX)objcopy
+OBJDUMP = $(GCC_ARM_PATH)$(GCC_PREFIX)objdump
+SIZE = $(GCC_ARM_PATH)$(GCC_PREFIX)size
 DFU = dfu-util
 CURL = curl
 

build/readme.md

@@ -18,6 +18,32 @@ submodules before deleting the `build\target` directory, E.g.
 make clean all
 ```
 
+
+## Specifying custom toolchain location
+
+Custom compiler prefix can be used via an environment variable `GCC_PREFIX`.
+
+For example when you have installed a custom toolchain under
+`/opt/gcc-arm-embedded-bin` you can use invoke make using that toolchain
+like this:
+
+```
+GCC_PREFIX="/opt/gcc-arm-embedded-bin/bin/arm-none-eabi-" make
+```
+
+The default value of `GCC_PREFIX` is `arm-none-eabi`, which uses the ARM
+version of the GCC toolchain, assumed to be in the path. 
+
+Alternatively, path for the tools can be specified separately as `GCC_ARM_PATH`,
+which, if specified should end with a directory separator, e.g.
+
+```
+GCC_ARM_PATH="/opt/gcc-arm-embedded-bin/bin/" make
+```
+
+
+
+
 ## Controlling Verbosity
 
 By default the makefile is quiet - the only output is when an .elf file is produced to