Skip to content

Commit f640b5c

Browse files
committed
chore: merge remote-tracking branch 'upstream/master' into develop
2 parents e22e751 + b1093e9 commit f640b5c

4 files changed

Lines changed: 3 additions & 6 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ifndef VERBOSE
1+
ifneq ($(VERBOSE),true)
22
.SILENT:
33
endif
44

builddefs/build_keyboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# responsible for determining which folder is being used and doing the
55
# corresponding environment setup.
66

7-
ifndef VERBOSE
7+
ifneq ($(VERBOSE),true)
88
.SILENT:
99
endif
1010

builddefs/build_test.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ifndef VERBOSE
1+
ifneq ($(VERBOSE),true)
22
.SILENT:
33
endif
44

lib/python/qmk/build_targets.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ def _common_make_args(self, dry_run: bool = False, build_target: str = None, **e
113113
'builddefs/build_keyboard.mk',
114114
]
115115

116-
if not cli.config.general.verbose:
117-
compile_args.append('-s')
118-
119116
verbose = 'true' if cli.config.general.verbose else 'false'
120117
color = 'true' if cli.config.general.color else 'false'
121118

0 commit comments

Comments
 (0)