Revert "wip: kaleidoscope-builder: respect the prefix/suffix/basename env vars"

This reverts commit 202f4b818d.
pull/851/head
Gergely Nagy 4 years ago
parent 503263976a
commit e2d8b5a614
No known key found for this signature in database
GPG Key ID: AC1E90BAC433F68F

@ -26,9 +26,7 @@ if [ "${ARCH}" = "virtual" ]; then
COMPILER_PATH="/usr/bin/" COMPILER_PATH="/usr/bin/"
fi fi
if [ "${COMPILER_PREFIX}" = "avr-" ]; then COMPILER_PREFIX=""
COMPILER_PREFIX=""
fi
else else
ARCH="avr" ARCH="avr"
fi fi
@ -262,10 +260,12 @@ ARDUINO_IDE_VERSION="10607"
# Allow the compiler path to be empty for virtual builds # Allow the compiler path to be empty for virtual builds
COMPILER_PATH="${COMPILER_PATH-${ARDUINO_TOOLS_PATH}/avr/bin/}" COMPILER_PATH="${COMPILER_PATH-${ARDUINO_TOOLS_PATH}/avr/bin/}"
C_COMPILER_BASENAME="${C_COMPILER_BASENAME:-$(basename ${CC:-gcc})}" COMPILER_SUFFIX=""
CXX_COMPILER_BASENAME="${CXX_COMPILER_BASENAME:-$(basename ${CXX:-g++})}"
AR_BASENAME="${AR_BASENAME:-$(basename ${AR:-ar})}" C_COMPILER_BASENAME=$(basename ${CC:-gcc})
OBJCOPY_BASENAME="${OBJCOPY_BASENAME:-$(basename ${OBJCOPY:-objcopy})}" 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 # Allow the compiler prefix to be empty for virtual builds
COMPILER_PREFIX="${COMPILER_PREFIX-avr-}" COMPILER_PREFIX="${COMPILER_PREFIX-avr-}"

Loading…
Cancel
Save