Browse Source

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

Fred Sundvik 8 years ago
parent
commit
ba405cfbb4
1 changed files with 7 additions and 5 deletions
  1. 7 5
      tmk_core/avr.mk

+ 7 - 5
tmk_core/avr.mk

@@ -87,11 +87,13 @@ DEBUG_PORT = 4242
 DEBUG_HOST = localhost
 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
 endif
 
 
 # Program the device.
 # Program the device.