|
|
@ -118,6 +118,16 @@ _set_executable_paths() {
|
|
|
|
###### Executable paths
|
|
|
|
###### Executable paths
|
|
|
|
######
|
|
|
|
######
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ "${ARCH}" = "virtual" ]; then
|
|
|
|
|
|
|
|
if [ "${uname_S}" = "FreeBSD" ]; then
|
|
|
|
|
|
|
|
: "${COMPILER_PATH:=/usr/local/bin/}"
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
: "${COMPILER_PATH:=/usr/bin/}"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
COMPILER_PREFIX=""
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Allow the compiler path to be empty for virtual builds
|
|
|
|
# Allow the compiler path to be empty for virtual builds
|
|
|
|
# should use compiler.path instead of appending bin, but we don't have substitution het
|
|
|
|
# should use compiler.path instead of appending bin, but we don't have substitution het
|
|
|
|
: "${COMPILER_PATH=$(_arduino_prop 'runtime.tools.avr-gcc.path')/bin}"
|
|
|
|
: "${COMPILER_PATH=$(_arduino_prop 'runtime.tools.avr-gcc.path')/bin}"
|
|
|
@ -442,7 +452,6 @@ else
|
|
|
|
ARDUINO_VERBOSE="--quiet"
|
|
|
|
ARDUINO_VERBOSE="--quiet"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [[ -z "${ARCH}" && -n "${FQBN}" ]]; then
|
|
|
|
if [[ -z "${ARCH}" && -n "${FQBN}" ]]; then
|
|
|
|
ARCH=$(echo "${FQBN}" | sed -n -e 's/^[^:]\+:\([^:]\+\).*/\1/p')
|
|
|
|
ARCH=$(echo "${FQBN}" | sed -n -e 's/^[^:]\+:\([^:]\+\).*/\1/p')
|
|
|
|
fi
|
|
|
|
fi
|
|
|
@ -451,15 +460,6 @@ fi
|
|
|
|
: "${ARCH:=avr}"
|
|
|
|
: "${ARCH:=avr}"
|
|
|
|
: "${FQBN:=keyboardio:${ARCH}:${BOARD}}"
|
|
|
|
: "${FQBN:=keyboardio:${ARCH}:${BOARD}}"
|
|
|
|
|
|
|
|
|
|
|
|
if [ "${ARCH}" = "virtual" ]; then
|
|
|
|
|
|
|
|
if [ "${uname_S}" = "FreeBSD" ]; then
|
|
|
|
|
|
|
|
: "${COMPILER_PATH:=/usr/local/bin/}"
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
: "${COMPILER_PATH:=/usr/bin/}"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
COMPILER_PREFIX=""
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ $# -eq 2 ]; then
|
|
|
|
if [ $# -eq 2 ]; then
|
|
|
|