Append user variables to the end of make command (#20177)

This commit is contained in:
Albert Y 2023-04-03 13:20:39 +08:00 committed by GitHub
parent bc77e79ed8
commit 47a51fda5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -178,9 +178,6 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa
if bootloader: if bootloader:
make_command.append(bootloader) make_command.append(bootloader)
for key, value in env_vars.items():
make_command.append(f'{key}={value}')
make_command.extend([ make_command.extend([
f'KEYBOARD={user_keymap["keyboard"]}', f'KEYBOARD={user_keymap["keyboard"]}',
f'KEYMAP={user_keymap["keymap"]}', f'KEYMAP={user_keymap["keymap"]}',
@ -201,6 +198,9 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa
'QMK_BIN="qmk"', 'QMK_BIN="qmk"',
]) ])
for key, value in env_vars.items():
make_command.append(f'{key}={value}')
return make_command return make_command