Simplify defaulting of ARCH and FQBN

tmp/arduino-cli-pre-rebase
Jesse Vincent 4 years ago
parent 809f367b32
commit 2ba10574d4
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -424,13 +424,10 @@ do_compile () {
# shellcheck disable=SC1090 # shellcheck disable=SC1090
FQBN="$(. "${SKETCH_DIR}"/.kaleidoscope-builder.conf && echo "${FQBN}")" FQBN="$(. "${SKETCH_DIR}"/.kaleidoscope-builder.conf && echo "${FQBN}")"
if [ -n "${BOARD}" ]; then if [ -n "${BOARD}" ]; then
if [ -z "${ARCH}" ]; then : "${ARCH:=avr}"
FQBN="keyboardio:avr:${BOARD}"
else
FQBN="keyboardio:${ARCH}:${BOARD}" FQBN="keyboardio:${ARCH}:${BOARD}"
fi fi
fi fi
fi
_CMD_CXX="${CXX:-${COMPILER_PREFIX}${CXX_COMPILER_BASENAME}${COMPILER_SUFFIX}}" _CMD_CXX="${CXX:-${COMPILER_PREFIX}${CXX_COMPILER_BASENAME}${COMPILER_SUFFIX}}"
_CMD_CC="${CC:-${COMPILER_PREFIX}${C_COMPILER_BASENAME}${COMPILER_SUFFIX}}" _CMD_CC="${CC:-${COMPILER_PREFIX}${C_COMPILER_BASENAME}${COMPILER_SUFFIX}}"

Loading…
Cancel
Save