From bb3465d102a3ef3a1f996b2ea82efd2a81a65b6c Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Sun, 18 Oct 2020 19:00:43 -0700
Subject: [PATCH] do a better job of mirrroing our older config

---
 bin/kaleidoscope-builder | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index 8bf5344c..8a92e042 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -484,12 +484,12 @@ do_compile_with_builder() {
 	      -build-path "${BUILD_PATH}" \
 	      -ide-version "${ARDUINO_IDE_VERSION}" \
 	      -built-in-libraries "${ARDUINO_PATH}/libraries" \
-	      -prefs "compiler.cpp.extra_flags=${ARDUINO_CFLAGS} ${LOCAL_CFLAGS}" \
-	      -prefs "compiler.path=${COMPILER_PATH}" \
-	      -prefs "compiler.c.cmd=${_CMD_CC}" \
-	      -prefs "compiler.cpp.cmd=${_CMD_CXX}" \
-        -prefs "compiler.ar.cmd=${_CMD_AR}" \
-        -prefs "compiler.c.elf.cmd=${_CMD_CXX}" \
+	      -prefs compiler.cpp.extra_flags="${ARDUINO_CFLAGS} ${LOCAL_CFLAGS}" \
+	      -prefs compiler.path="${COMPILER_PATH}" \
+	      -prefs compiler.c.cmd="${_CMD_CC}" \
+	      -prefs compiler.cpp.cmd="${_CMD_CXX}" \
+              -prefs compiler.ar.cmd="${_CMD_AR}" \
+              -prefs compiler.c.elf.cmd="${_CMD_CXX}" \
 	      $CCACHE_ENABLE \
 	      -warnings all \
         ${ARDUINO_VERBOSE} \
@@ -505,6 +505,12 @@ do_compile_with_cli() {
 		--libraries "${KALEIDOSCOPE_DIR}/.."  \
 		--build-path=${BUILD_PATH} \
 		--output-dir=${OUTPUT_PATH} \
+	      --build-properties "compiler.cpp.extra_flags=${ARDUINO_CFLAGS} ${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}" \
 	        "${SKETCH_FILE_PATH}"
 }