From ac877438f12f1bc70ad55d6726955ac648d40aa8 Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Thu, 29 Dec 2016 12:55:33 +1300 Subject: [PATCH] Removed 'local.mk' from repo so that it will be properly ignored. --- Makefile | 3 ++- make/local.mk | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 make/local.mk diff --git a/Makefile b/Makefile index 523746941..8c6c5e0eb 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/make/local.mk b/make/local.mk deleted file mode 100644 index 1b66457a5..000000000 --- a/make/local.mk +++ /dev/null @@ -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 -- 2.11.4.GIT