g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't search for TEENSY_LOADER_CLI if it's already defined

daktil_manuform
Fred Sundvik 2017-07-10 13:50:07 +03:00 committed by Jack Humbert
parent 7ea8753b72
commit ba405cfbb4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tmk_core/avr.mk
View File

@ -87,11 +87,13 @@ DEBUG_PORT = 4242
DEBUG_HOST = localhost DEBUG_HOST = localhost
#============================================================================ #============================================================================
# Autodecct teensy loader # Autodetect teensy loader
ifneq (, $(shell which teensy-loader-cli 2>/dev/null)) ifndef TEENSY_LOADER_CLI
ifneq (, $(shell which teensy-loader-cli 2>/dev/null))
TEENSY_LOADER_CLI ?= teensy-loader-cli TEENSY_LOADER_CLI ?= teensy-loader-cli
else else
TEENSY_LOADER_CLI ?= teensy_loader_cli TEENSY_LOADER_CLI ?= teensy_loader_cli
endif
endif endif
# Program the device. # Program the device.