diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf
index 44467853..72cedfa3 100644
--- a/etc/kaleidoscope-builder.conf
+++ b/etc/kaleidoscope-builder.conf
@@ -26,9 +26,7 @@ if [ "${ARCH}" = "virtual" ]; then
        COMPILER_PATH="/usr/bin/"
     fi
 
-    if [ "${COMPILER_PREFIX}" = "avr-" ]; then
-        COMPILER_PREFIX=""
-    fi
+    COMPILER_PREFIX=""
 else
    ARCH="avr"
 fi
@@ -262,10 +260,12 @@ ARDUINO_IDE_VERSION="10607"
 # Allow the compiler path to be empty for virtual builds
 COMPILER_PATH="${COMPILER_PATH-${ARDUINO_TOOLS_PATH}/avr/bin/}"
 
-C_COMPILER_BASENAME="${C_COMPILER_BASENAME:-$(basename ${CC:-gcc})}"
-CXX_COMPILER_BASENAME="${CXX_COMPILER_BASENAME:-$(basename ${CXX:-g++})}"
-AR_BASENAME="${AR_BASENAME:-$(basename ${AR:-ar})}"
-OBJCOPY_BASENAME="${OBJCOPY_BASENAME:-$(basename ${OBJCOPY:-objcopy})}"
+COMPILER_SUFFIX=""
+
+C_COMPILER_BASENAME=$(basename ${CC:-gcc})
+CXX_COMPILER_BASENAME=$(basename ${CXX:-g++})
+AR_BASENAME=$(basename ${AR:-ar})
+OBJCOPY_BASENAME=$(basename ${OBJCOPY:-objcopy})
 
 # Allow the compiler prefix to be empty for virtual builds
 COMPILER_PREFIX="${COMPILER_PREFIX-avr-}"