Simplify defaulting of ARCH and FQBN

4 years ago · 2ba10574d4
parent 809f367b32
commit 2ba10574d4
1 changed files with 2 additions and 5 deletions
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@ -424,13 +424,10 @@ do_compile () {
        # shellcheck disable=SC1090
        FQBN="$(. "${SKETCH_DIR}"/.kaleidoscope-builder.conf && echo "${FQBN}")"
        if [ -n "${BOARD}" ]; then
-            if [ -z "${ARCH}" ]; then
-               FQBN="keyboardio:avr:${BOARD}"
-            else
+            : "${ARCH:=avr}"
            FQBN="keyboardio:${ARCH}:${BOARD}"
        fi
    fi
-    fi

    _CMD_CXX="${CXX:-${COMPILER_PREFIX}${CXX_COMPILER_BASENAME}${COMPILER_SUFFIX}}"
    _CMD_CC="${CC:-${COMPILER_PREFIX}${C_COMPILER_BASENAME}${COMPILER_SUFFIX}}"