Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use bin/qmk if qmk is not in the path #12271

Closed
wants to merge 1 commit into from
Closed

Use bin/qmk if qmk is not in the path #12271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif
endif

# Determine which qmk cli to use
ifeq (, $(shell which qmk))
ifeq ($(shell which qmk),)
QMK_BIN = bin/qmk
else
QMK_BIN = qmk
Expand Down
6 changes: 5 additions & 1 deletion build_keyboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ endif
include common.mk

# Set the qmk cli to use
QMK_BIN ?= qmk
ifeq ($(shell which qmk),)
QMK_BIN ?= bin/qmk
else
QMK_BIN ?= qmk
endif
Comment on lines +16 to +20
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ifeq ($(shell which qmk),)
QMK_BIN ?= bin/qmk
else
QMK_BIN ?= qmk
endif
QMK_BIN ?= qmk

Copy link
Author

@nomis nomis Mar 18, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I do that it will not build after a clean.

Even when it is building, make complains once because it is still trying to run qmk from the path:

make[1]: qmk: Command not found

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's also inconsistent with the behaviour in Makefile that automatically uses bin/qmk if qmk does not exist.


# Set the filename for the final firmware binary
KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD))
Expand Down