try a hacky workaround for the fact that arduino-cli doesn't seem to let us put doublequotes in build-props

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

@ -505,12 +505,12 @@ do_compile_with_cli() {
--libraries "${KALEIDOSCOPE_DIR}/.." \ --libraries "${KALEIDOSCOPE_DIR}/.." \
--build-path "${BUILD_PATH}" \ --build-path "${BUILD_PATH}" \
--output-dir "${OUTPUT_PATH}" \ --output-dir "${OUTPUT_PATH}" \
--build-properties "compiler.cpp.extra_flags=$(printf "%q", ${LOCAL_CFLAGS})" \
--build-properties compiler.path="${COMPILER_PATH}" \ --build-properties compiler.path="${COMPILER_PATH}" \
--build-properties "compiler.c.cmd=${_CMD_CC}" \ --build-properties "compiler.c.cmd=${_CMD_CC}" \
--build-properties "compiler.cpp.cmd=${_CMD_CXX}" \ --build-properties "compiler.cpp.cmd=${_CMD_CXX}" \
--build-properties "compiler.ar.cmd=${_CMD_AR}" \ --build-properties "compiler.ar.cmd=${_CMD_AR}" \
--build-properties "compiler.c.elf.cmd=${_CMD_CXX}" \ --build-properties "compiler.c.elf.cmd=${_CMD_CXX}" \
--build-properties "compiler.cpp.extra_flags=${LOCAL_CFLAGS}"\
"${SKETCH_FILE_PATH}" "${SKETCH_FILE_PATH}"
} }

@ -52,7 +52,7 @@ compile-sketch:
@echo "link" @echo "link"
install -d "${BIN_DIR}" "${LIB_DIR}" install -d "${BIN_DIR}" "${LIB_DIR}"
env LIBONLY=yes \ env LIBONLY=yes \
LOCAL_CFLAGS='"-I$(shell pwd)"' \ LOCAL_CFLAGS="'-I$(shell pwd)'" \
OUTPUT_PATH="${LIB_DIR}" \ OUTPUT_PATH="${LIB_DIR}" \
VERBOSE=${VERBOSE} \ VERBOSE=${VERBOSE} \
ARCH=virtual DEFAULT_SKETCH=sketch \ ARCH=virtual DEFAULT_SKETCH=sketch \

Loading…
Cancel
Save