optional toolchain-user.mak include file

rene-dev · Apr 11, 2018 · 69f262c · 69f262c
1 parent e437ba7
commit 69f262c
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -74,3 +74,4 @@ src/conf_templates.c
 stm32f303/inc/commandslist.h
 stm32f303/inc/hal_tbl.h
 stm32f303/src/hal_tbl.c
+toolchain-user.mak
diff --git a/Makefile b/Makefile
@@ -349,7 +349,6 @@ clean:
 # Include the base rules
 #
 include base.mak
-include toolchain.mak
 
 # Include the dependency files
 #

diff --git a/base.mak b/base.mak
@@ -86,3 +86,6 @@ flash: $(TARGET).bin
 %.dfu: %.bin
 	@cp $< $@
 	@$(DFU-SUFFIX) -v 0483 -p df11 -a $@
+
+include toolchain.mak
+-include toolchain-user.mak
diff --git a/bootloader/Makefile b/bootloader/Makefile
@@ -148,7 +148,6 @@ clean:
 # Include the base rules
 #
 include base.mak
-include toolchain.mak
 
 # Include the dependency files
 #

diff --git a/f3_boot/Makefile b/f3_boot/Makefile
@@ -168,7 +168,6 @@ clean:
 # Include the base rules
 #
 include base.mak
-include toolchain.mak
 
 # Include the dependency files
 #

diff --git a/stm32f303/Makefile b/stm32f303/Makefile
@@ -216,7 +216,6 @@ clean:
 # Include the base rules
 #
 include base.mak
-include toolchain.mak
 
 # Include the dependency files
 #

diff --git a/toolchain.mak b/toolchain.mak
@@ -1,4 +1,5 @@
 # Define programs and commands for the toolchain
+# Do not modiy this file. Instead create a file toolchain-user.mak which can overwrite anything in here.
 PYTHON     = python
 DFU-UTIL   = dfu-util
 DFU-SUFFIX = dfu-suffix