From 0e1e543836653c48fb6ddf6f57adeb62ed8318d8 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 21 Mar 2023 16:25:08 +0800
Subject: Increase verbosity of make command (#20172)

---
 lib/python/qmk/commands.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/python/qmk/commands.py')

diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 5561a354c5..f5eac4bf0e 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -51,6 +51,9 @@ def create_make_target(target, dry_run=False, parallel=1, **env_vars):
     for key, value in env_vars.items():
         env.append(f'{key}={value}')
 
+    if cli.config.general.verbose:
+        env.append('VERBOSE=true')
+
     return [make_cmd, *(['-n'] if dry_run else []), *get_make_parallel_args(parallel), *env, target]
 
 
-- 
cgit v1.2.3


From 47a51fda5dea81775ade0c936aeccc1ed6ebc53a Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Mon, 3 Apr 2023 13:20:39 +0800
Subject: Append user variables to the end of make command (#20177)

---
 lib/python/qmk/commands.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/python/qmk/commands.py')

diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index f5eac4bf0e..b1eac13957 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -178,9 +178,6 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa
     if bootloader:
         make_command.append(bootloader)
 
-    for key, value in env_vars.items():
-        make_command.append(f'{key}={value}')
-
     make_command.extend([
         f'KEYBOARD={user_keymap["keyboard"]}',
         f'KEYMAP={user_keymap["keymap"]}',
@@ -201,6 +198,9 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa
         'QMK_BIN="qmk"',
     ])
 
+    for key, value in env_vars.items():
+        make_command.append(f'{key}={value}')
+
     return make_command
 
 
-- 
cgit v1.2.3