diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2017-07-10 13:50:07 +0300 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-07-10 09:00:18 -0400 |
| commit | ba405cfbb4b887af8007edfeed4d9fc43766d911 (patch) | |
| tree | a4b13ed8c9e91f81e003a97576b92977c644c376 | |
| parent | 7ea8753b72ed7ddecdcb2db5b223ca920f8155b3 (diff) | |
| download | qmk_firmware-ba405cfbb4b887af8007edfeed4d9fc43766d911.tar.gz qmk_firmware-ba405cfbb4b887af8007edfeed4d9fc43766d911.zip | |
Don't search for TEENSY_LOADER_CLI if it's already defined
| -rw-r--r-- | tmk_core/avr.mk | 12 |
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 | |||
| 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. |