Merge remote-tracking branch 'origin/master' into develop

3 years ago · cc9520b7a0
parent ef6505ad75 e296d67146
commit cc9520b7a0
1 changed files with 3 additions and 2 deletions
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@ -46,11 +46,12 @@ ifdef SKIP_VERSION
 endif

 # Generate the version.h file
+VERSION_H_FLAGS :=
 ifdef SKIP_VERSION
-VERSION_H_FLAGS := --skip-all
+VERSION_H_FLAGS += --skip-all
 endif
 ifdef SKIP_GIT
-VERSION_H_FLAGS := --skip-git
+VERSION_H_FLAGS += --skip-git
 endif

 # Generate the board's version.h file.