Merge pull request #1918 from mikeller/remove_local_mk

Removed 'local.mk' from repo so that it will be properly ignored.
2016-12-30 13:51:43 +13:00 · 2016-12-30 13:51:43 +13:00 · 6aec4e1ec5
parent 4191afdfdb ac877438f1
commit 6aec4e1ec5
2 changed files with 2 additions and 3 deletions
--- a/3
+++ b/3
@ -76,8 +76,9 @@ LINKER_DIR      = $(ROOT)/src/main/target/link
 # Build tools, so we all share the same versions
 # import macros common to all supported build systems
 include $(ROOT)/make/system-id.mk
+
 # developer preferences, edit these at will, they'll be gitignored
-include $(ROOT)/make/local.mk
+-include $(ROOT)/make/local.mk

 # configure some directories that are relative to wherever ROOT_DIR is located
 TOOLS_DIR := $(ROOT)/tools
--- a/make/local.mk
+++ b/make/local.mk
@ -1,2 +0,0 @@
-# override the toolchain version, should match the output from of your version of the toolchain: $(arm-none-eabi-gcc -dumpversion)
-#GCC_REQUIRED_VERSION=5.4.1