aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/cli/userspace/compile.py
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-08-12 12:34:54 +0000
committerQMK Bot <[email protected]>2024-08-12 12:34:54 +0000
commit2c6409fdd8deed5b10410b5e9a74748499e0739c (patch)
tree240efdcdff73fa87a47c5cd9b87b63a7b9263291 /lib/python/qmk/cli/userspace/compile.py
parent783f97ff32de1d6febceb09f46dfa624e4fc56ec (diff)
parent380e0c9cad72ac29f858bef85c8b8eb35b6931f0 (diff)
downloadqmk_firmware-2c6409fdd8deed5b10410b5e9a74748499e0739c.tar.gz
qmk_firmware-2c6409fdd8deed5b10410b5e9a74748499e0739c.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/cli/userspace/compile.py')
-rw-r--r--lib/python/qmk/cli/userspace/compile.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/python/qmk/cli/userspace/compile.py b/lib/python/qmk/cli/userspace/compile.py
index e8cdf6cd97..f164ca2ef1 100644
--- a/lib/python/qmk/cli/userspace/compile.py
+++ b/lib/python/qmk/cli/userspace/compile.py
@@ -1,4 +1,4 @@
-# Copyright 2023 Nick Brassel (@tzarc)
+# Copyright 2023-2024 Nick Brassel (@tzarc)
# SPDX-License-Identifier: GPL-2.0-or-later
from pathlib import Path
from milc import cli
@@ -12,6 +12,10 @@ from qmk.cli.mass_compile import mass_compile_targets
from qmk.util import maybe_exit_config
+def _extra_arg_setter(target, extra_args):
+ target.extra_args = extra_args
+
+
@cli.argument('-t', '--no-temp', arg_only=True, action='store_true', help="Remove temporary files during build.")
@cli.argument('-j', '--parallel', type=int, default=1, help="Set the number of parallel make jobs; 0 means unlimited.")
@cli.argument('-c', '--clean', arg_only=True, action='store_true', help="Remove object files before compiling.")
@@ -33,8 +37,8 @@ def userspace_compile(cli):
if isinstance(e, Path):
build_targets.append(JsonKeymapBuildTarget(e))
elif isinstance(e, dict):
- keyboard_keymap_targets.append((e['keyboard'], e['keymap']))
-
+ f = e['env'] if 'env' in e else None
+ keyboard_keymap_targets.append((e['keyboard'], e['keymap'], f))
if len(keyboard_keymap_targets) > 0:
build_targets.extend(search_keymap_targets(keyboard_keymap_targets))