summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-07-10 13:50:07 +0300
committerJack Humbert <jack.humb@gmail.com>2017-07-10 09:00:18 -0400
commitba405cfbb4b887af8007edfeed4d9fc43766d911 (patch)
treea4b13ed8c9e91f81e003a97576b92977c644c376 /tmk_core
parent7ea8753b72ed7ddecdcb2db5b223ca920f8155b3 (diff)
Don't search for TEENSY_LOADER_CLI if it's already defined
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/avr.mk12
1 files changed, 7 insertions, 5 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index a36d219dd0..6773726ee3 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -87,11 +87,13 @@ DEBUG_PORT = 4242
DEBUG_HOST = localhost
#============================================================================
-# Autodecct teensy loader
-ifneq (, $(shell which teensy-loader-cli 2>/dev/null))
- TEENSY_LOADER_CLI ?= teensy-loader-cli
-else
- TEENSY_LOADER_CLI ?= teensy_loader_cli
+# Autodetect teensy loader
+ifndef TEENSY_LOADER_CLI
+ ifneq (, $(shell which teensy-loader-cli 2>/dev/null))
+ TEENSY_LOADER_CLI ?= teensy-loader-cli
+ else
+ TEENSY_LOADER_CLI ?= teensy_loader_cli
+ endif
endif
# Program the device.