Arduino-cli 0.14 is ancient and unsupported.

Remove the workarounds for its old deprecated --build-properties syntax.
Also fix the other place we were using the deprecated syntax
pull/1144/head
Jesse Vincent 3 years ago
parent 628117478e
commit e2ca8ee815
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -104,22 +104,11 @@ _arduino_props := $(shell ${ARDUINO_CLI} compile $(fqbn_arg) --show-properties
_arduino_prop = $(subst $1=,,$(subst 🔥, ,$(filter $1=%,$(_arduino_props)))) _arduino_prop = $(subst $1=,,$(subst 🔥, ,$(filter $1=%,$(_arduino_props))))
_arduino_version := $(shell ${ARDUINO_CLI} version | sed 's/.*Version: \([0-9][0-9\.]*\).*/\1/')
export ARDUINO_CLI_VERSION ?= $(_arduino_version)
_arduino_build_property_flag := $(shell echo -e "0.14\n${ARDUINO_CLI_VERSION}" | sort -C -t. -k1,1n -k2,2n && echo "YES")
ARDUINO_BUILD_PROP_FLAG := --build-properties
ifeq ($(_arduino_build_property_flag),YES)
ARDUINO_BUILD_PROP_FLAG := --build-property
endif
# How to use_arduino_prop # How to use_arduino_prop
# $(call _arduino_prop,recipe.hooks.sketch.prebuild.2.pattern) # $(call _arduino_prop,recipe.hooks.sketch.prebuild.2.pattern)
ifneq ($(KALEIDOSCOPE_CCACHE),) ifneq ($(KALEIDOSCOPE_CCACHE),)
ccache_wrapper_property := $(ARDUINO_BUILD_PROP_FLAG) "compiler.wrapper.cmd=ccache" ccache_wrapper_property := --build-property compiler.wrapper.cmd=ccache
endif endif
.PHONY: configure-arduino-cli install-arduino-core-kaleidoscope install-arduino-core-avr .PHONY: configure-arduino-cli install-arduino-core-kaleidoscope install-arduino-core-avr

@ -162,7 +162,7 @@ clean:
ifneq ($(LOCAL_CFLAGS),) ifneq ($(LOCAL_CFLAGS),)
local_cflags_property = --build-properties "compiler.cpp.extra_flags=${LOCAL_CFLAGS}" local_cflags_property = --build-property "compiler.cpp.extra_flags=${LOCAL_CFLAGS}"
else else
local_cflags_property = local_cflags_property =
endif endif

Loading…
Cancel
Save