1 files changed, 7 insertions, 5 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index a36d219dd..6773726ee 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -87,11 +87,13 @@ DEBUG_PORT = 4242
 DEBUG_HOST = localhost
 #============================================================================
-# Autodecct teensy loader
+# Autodetect teensy loader
-ifneq (, $(shell which teensy-loader-cli 2>/dev/null))
+ifndef TEENSY_LOADER_CLI
-  TEENSY_LOADER_CLI ?= teensy-loader-cli
+    ifneq (, $(shell which teensy-loader-cli 2>/dev/null))
-else
+        TEENSY_LOADER_CLI ?= teensy-loader-cli
-  TEENSY_LOADER_CLI ?= teensy_loader_cli
+    else
+        TEENSY_LOADER_CLI ?= teensy_loader_cli
+    endif
 endif
 # Program the device.

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index a36d219dd..6773726ee 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk
@@ -87,11 +87,13 @@ DEBUG_PORT = 4242
87	DEBUG_HOST = localhost	87	DEBUG_HOST = localhost
88		88
89	#============================================================================	89	#============================================================================
90	# Autodecct teensy loader	90	# Autodetect teensy loader
91	ifneq (, $(shell which teensy-loader-cli 2>/dev/null))	91	ifndef TEENSY_LOADER_CLI
92	TEENSY_LOADER_CLI ?= teensy-loader-cli	92	ifneq (, $(shell which teensy-loader-cli 2>/dev/null))
93	else	93	TEENSY_LOADER_CLI ?= teensy-loader-cli
94	TEENSY_LOADER_CLI ?= teensy_loader_cli	94	else
		95	TEENSY_LOADER_CLI ?= teensy_loader_cli
		96	endif
95	endif	97	endif
96		98
97	# Program the device.	99	# Program the device.