mirror of
https://github.com/qmk/qmk_userspace.git
synced 2026-10-22 15:37:07 -04:00
Fix locating of qmk_firrmware on milc>=2.0.0 (#85)
This commit is contained in:
parent
caa715695d
commit
940d6f5678
1 changed files with 6 additions and 2 deletions
8
Makefile
8
Makefile
|
|
@ -7,9 +7,13 @@ ifeq ($(QMK_USERSPACE),)
|
||||||
QMK_USERSPACE := $(shell pwd)
|
QMK_USERSPACE := $(shell pwd)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
QMK_FIRMWARE_ROOT = $(shell qmk config -ro user.qmk_home | cut -d= -f2 | sed -e 's@^None$$@@g')
|
# Determine which qmk cli to use
|
||||||
|
QMK_BIN := qmk
|
||||||
|
|
||||||
|
# Try to determine qmk_firmware from qmk config - no fallback is required as this functionality has existed since qmk_cli 0.0.46
|
||||||
|
QMK_FIRMWARE_ROOT = $(shell $(QMK_BIN) env QMK_FIRMWARE)
|
||||||
ifeq ($(QMK_FIRMWARE_ROOT),)
|
ifeq ($(QMK_FIRMWARE_ROOT),)
|
||||||
$(error Cannot determine qmk_firmware location. `qmk config -ro user.qmk_home` is not set)
|
$(error Cannot determine qmk_firmware location. `qmk config -ro user.qmk_home` or QMK_HOME environment variable is not set)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
%:
|
%:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue