Renamed virtual architecture "virtual"

Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
pull/640/head
Florian Fleissner 6 years ago committed by Jesse Vincent
parent ca4f40dbb6
commit 0ac7c191dc

@ -93,7 +93,7 @@ enable_ccache () {
firmware_size () { firmware_size () {
if [ "${ARCH}" = "x86" ]; then if [ "${ARCH}" = "virtual" ]; then
echo "[Size not computed for virtual build]" echo "[Size not computed for virtual build]"
return return
fi fi

@ -17,10 +17,10 @@ if [ -z "${ARCH}" ]; then
ARCH=$(echo "${FQBN}" | sed -n -e 's/^[^:]\+:\([^:]\+\).*/\1/p') ARCH=$(echo "${FQBN}" | sed -n -e 's/^[^:]\+:\([^:]\+\).*/\1/p')
fi fi
if [ "${ARCH}" = "x86" ]; then if [ "${ARCH}" = "virtual" ]; then
FQBN="${FQBN:-keyboardio:x86:${BOARD}}" FQBN="${FQBN:-keyboardio:virtual:${BOARD}}"
# Set the compiler path for virtual builds (x86) # Set the compiler path for virtual builds
# #
if [ -z "${COMPILER_PATH}" ]; then if [ -z "${COMPILER_PATH}" ]; then
COMPILER_PATH="/usr/bin" COMPILER_PATH="/usr/bin"
@ -157,10 +157,10 @@ ARDUINO_IDE_VERSION="10607"
###### Executable paths ###### Executable paths
###### ######
# Allow the compiler path to be empty for x86 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/}"
# Allow the compiler prefix to be empty for x86 builds # Allow the compiler prefix to be empty for virtual builds
COMPILER_PREFIX="${COMPILER_PREFIX-avr-}" COMPILER_PREFIX="${COMPILER_PREFIX-avr-}"
AVR_SIZE="${AVR_SIZE:-${COMPILER_PATH}/${COMPILER_PREFIX}size}" AVR_SIZE="${AVR_SIZE:-${COMPILER_PATH}/${COMPILER_PREFIX}size}"
AVR_SIZE_FLAGS="${AVR_SIZE_FLAGS:--C --mcu=${MCU}}" AVR_SIZE_FLAGS="${AVR_SIZE_FLAGS:--C --mcu=${MCU}}"

Loading…
Cancel
Save