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

This commit is contained in:
QMK Bot 2023-04-03 05:21:14 +00:00
commit b3e34b9c29

View File

@ -179,9 +179,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"]}',
@ -202,6 +199,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