diff --git a/etc/makefiles/sketch.mk b/etc/makefiles/sketch.mk index f2f9b3c8..e8474af3 100644 --- a/etc/makefiles/sketch.mk +++ b/etc/makefiles/sketch.mk @@ -80,7 +80,7 @@ port := $(shell $(ARDUINO_CLI) board list --format=text | grep $(FQBN) |cut -d' $(SKETCH_FILE_PATH): - @echo "Sketch is $(SKETCH_FILE_PATH)" + $(info Sketch is $(SKETCH_FILE_PATH)) .PHONY: compile configure-arduino-cli install-arduino-core-kaleidoscope install-arduino-core-avr @@ -127,14 +127,13 @@ clean: compile: install -d "${OUTPUT_PATH}" @echo "Building ${SKETCH_FILE_PATH}" - $(ARDUINO_CLI) compile \ - --fqbn "${FQBN}" \ + $(ARDUINO_CLI) compile --fqbn "${FQBN}" ${ARDUINO_VERBOSE} \ --libraries "${KALEIDOSCOPE_PLATFORM_LIB_DIR}" \ --build-path "${BUILD_PATH}" \ --output-dir "${OUTPUT_PATH}" \ --build-cache-path "${CORE_CACHE_PATH}" \ --build-properties "compiler.cpp.extra_flags=${LOCAL_CFLAGS}" \ - --warnings all ${ARDUINO_VERBOSE} ${ccache_wrapper_property} \ + --warnings all ${ccache_wrapper_property} \ "${SKETCH_FILE_PATH}" ifeq ($(LIBONLY),) @cp "${BUILD_PATH}/${SKETCH_FILE_NAME}.hex" "${HEX_FILE_PATH}" diff --git a/testing/makefiles/testcase.mk b/testing/makefiles/testcase.mk index bd9035b7..50a0e319 100644 --- a/testing/makefiles/testcase.mk +++ b/testing/makefiles/testcase.mk @@ -57,18 +57,11 @@ compile-sketch: OUTPUT_PATH="${LIB_DIR}" \ $(MAKE) -f ${top_dir}/testing/makefiles/delegate.mk compile $(COMPILER_WRAPPER) $(call _arduino_prop,compiler.cpp.cmd) -o "${BIN_DIR}/${BIN_FILE}" \ - -lpthread \ - -g \ - -w \ - ${TEST_OBJS} \ - -L"${COMMON_LIB_DIR}" \ - -lcommon \ + -lpthread -g -w ${TEST_OBJS} \ + -L"${COMMON_LIB_DIR}" -lcommon \ "${LIB_DIR}/${LIB_FILE}" \ -L"${top_dir}/testing/googletest/build/lib" \ - -lgtest \ - -lgmock \ - -lpthread \ - -lm + -lgtest -lgmock -lpthread -lm # If we have a test.ktest file, it should be processed into a c++ testcase @@ -86,9 +79,9 @@ ifneq (,$(wildcard test.ktest)) endif ${OBJ_DIR}/%.o: ${SRC_DIR}/%.cpp - install -d "${OBJ_DIR}" - $(COMPILER_WRAPPER) $(call _arduino_prop,compiler.cpp.cmd) \ - -o "$@" -c -std=c++14 ${shared_includes} ${shared_defines} $< + @install -d "${OBJ_DIR}" + $(COMPILER_WRAPPER) $(call _arduino_prop,compiler.cpp.cmd) -o "$@" -c -std=c++14 \ + ${shared_includes} ${shared_defines} $< clean: rm -f -- "${SRC_DIR}/generated-testcase.cpp"