rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1918 from mikeller/remove_local_mk 

Removed 'local.mk' from repo so that it will be properly ignored.
This commit is contained in:
Michael Keller 2016-12-30 13:51:43 +13:00 committed by GitHub
parent 4191afdfdb ac877438f1
commit 6aec4e1ec5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -76,8 +76,9 @@ LINKER_DIR = $(ROOT)/src/main/target/link
# Build tools, so we all share the same versions # Build tools, so we all share the same versions
# import macros common to all supported build systems # import macros common to all supported build systems
include $(ROOT)/make/system-id.mk include $(ROOT)/make/system-id.mk
# developer preferences, edit these at will, they'll be gitignored # 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 # configure some directories that are relative to wherever ROOT_DIR is located
TOOLS_DIR := $(ROOT)/tools TOOLS_DIR := $(ROOT)/tools

2
make/local.mk
View File

@ -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