diff options
| author | Simon John <git@the-jedi.co.uk> | 2020-08-04 23:19:49 +0100 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2020-08-04 23:19:49 +0100 |
| commit | 207253abc6ec81112abf0a64a8bf68e227528d64 (patch) | |
| tree | b289b1a3ad4d2793e38e5072353b9f5484f98a7b /Arduino.mk | |
| parent | 6f786a96b0acfb0c9b2d2f4e39911d2803088729 (diff) | |
Rebased python3 branch with some changes from tuna-f1sh@87d5241
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -853,15 +853,15 @@ endif # Reset ifndef RESET_CMD - ARD_RESET_ARDUINO := $(shell which ard-reset-arduino 2> /dev/null) + ARD_RESET_ARDUINO := $(PYTHON_CMD) $(shell which ard-reset-arduino 2> /dev/null) ifndef ARD_RESET_ARDUINO # same level as *.mk in bin directory when checked out from git # or in $PATH when packaged - ARD_RESET_ARDUINO = $(ARDMK_DIR)/bin/ard-reset-arduino + ARD_RESET_ARDUINO = $(PYTHON_CMD) $(ARDMK_DIR)/bin/ard-reset-arduino endif ifneq (,$(findstring CYGWIN,$(shell uname -s))) # confirm user is using default cygwin unix Python (which uses ttySx) and not Windows Python (which uses COMx) - ifeq ($(shell which python),/usr/bin/python) + ifeq ($(PYTHON_CMD),/usr/bin/python) RESET_CMD = $(ARD_RESET_ARDUINO) $(ARD_RESET_OPTS) $(DEVICE_PATH) else RESET_CMD = $(ARD_RESET_ARDUINO) $(ARD_RESET_OPTS) $(call get_monitor_port) |