From: Fred Sundvik Date: Mon, 10 Jul 2017 10:50:07 +0000 (+0300) Subject: Don't search for TEENSY_LOADER_CLI if it's already defined X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ba405cfbb4b887af8007edfeed4d9fc43766d911;p=qmk_firmware.git Don't search for TEENSY_LOADER_CLI if it's already defined --- 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 -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.