Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
9f75ab2c92
4 changed files with 3 additions and 6 deletions
2
Makefile
2
Makefile
|
|
@ -1,4 +1,4 @@
|
|||
ifndef VERBOSE
|
||||
ifneq ($(VERBOSE),true)
|
||||
.SILENT:
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# responsible for determining which folder is being used and doing the
|
||||
# corresponding environment setup.
|
||||
|
||||
ifndef VERBOSE
|
||||
ifneq ($(VERBOSE),true)
|
||||
.SILENT:
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ifndef VERBOSE
|
||||
ifneq ($(VERBOSE),true)
|
||||
.SILENT:
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -113,9 +113,6 @@ class BuildTarget:
|
|||
'builddefs/build_keyboard.mk',
|
||||
]
|
||||
|
||||
if not cli.config.general.verbose:
|
||||
compile_args.append('-s')
|
||||
|
||||
verbose = 'true' if cli.config.general.verbose else 'false'
|
||||
color = 'true' if cli.config.general.color else 'false'
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue