From ea0a0c3dd6653c7c033b6fa56c3905045329dbe8 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Sun, 18 Oct 2020 22:18:59 -0700
Subject: [PATCH] try a hacky workaround for the fact that arduino-cli doesn't
 seem to let us put doublequotes in build-props

---
 bin/kaleidoscope-builder      | 2 +-
 testing/makefiles/testcase.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index 8038fddb..fd2cab9a 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -505,12 +505,12 @@ do_compile_with_cli() {
 		--libraries "${KALEIDOSCOPE_DIR}/.."  \
 		--build-path "${BUILD_PATH}" \
 		--output-dir "${OUTPUT_PATH}" \
-	      --build-properties "compiler.cpp.extra_flags=$(printf "%q", ${LOCAL_CFLAGS})" \
 	      --build-properties compiler.path="${COMPILER_PATH}" \
 	      --build-properties "compiler.c.cmd=${_CMD_CC}" \
 	      --build-properties "compiler.cpp.cmd=${_CMD_CXX}" \
               --build-properties "compiler.ar.cmd=${_CMD_AR}" \
               --build-properties "compiler.c.elf.cmd=${_CMD_CXX}" \
+	      --build-properties "compiler.cpp.extra_flags=${LOCAL_CFLAGS}"\
 	        "${SKETCH_FILE_PATH}"
 }
 
diff --git a/testing/makefiles/testcase.mk b/testing/makefiles/testcase.mk
index f28aff9f..a064adad 100644
--- a/testing/makefiles/testcase.mk
+++ b/testing/makefiles/testcase.mk
@@ -52,7 +52,7 @@ compile-sketch:
 	@echo "link"
 	install -d "${BIN_DIR}" "${LIB_DIR}"
 	env LIBONLY=yes \
-		  LOCAL_CFLAGS='"-I$(shell pwd)"' \
+		  LOCAL_CFLAGS="'-I$(shell pwd)'" \
 		  OUTPUT_PATH="${LIB_DIR}" \
 			VERBOSE=${VERBOSE} \
 			ARCH=virtual DEFAULT_SKETCH=sketch \