From 3a68baca25e86d37f61437900b6f352c47ec9719 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 17 Nov 2020 14:34:14 -0800 Subject: [PATCH] Revert "No longer hardcode ar and c++ in libcommon.mk" This reverts commit f9b756ff5d637ba9e1c52ff6569fa4d8dc545720. --- testing/makefiles/libcommon.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testing/makefiles/libcommon.mk b/testing/makefiles/libcommon.mk index f8623bd5..78e0fa94 100644 --- a/testing/makefiles/libcommon.mk +++ b/testing/makefiles/libcommon.mk @@ -1,7 +1,6 @@ top_dir := $(abspath $(dir $(lastword ${MAKEFILE_LIST}))../..) build_dir := ${top_dir}/_build -include $(top_dir)/etc/makefiles/arduino-cli.mk bundle_path = ${ARDUINO_DIRECTORIES_USER}/hardware/keyboardio/avr/libraries @@ -22,13 +21,12 @@ all: ${OBJ_FILES} ${LIB_DIR}/${LIB_FILE} ${LIB_DIR}/${LIB_FILE}: ${OBJ_FILES} @install -d "${LIB_DIR}" - $(call _arduino_prop,compiler.ar.cmd) \ - $(call _arduino_prop,compiler.ar.flags) "${LIB_DIR}/${LIB_FILE}" ${OBJ_FILES} + ar rcs "${LIB_DIR}/${LIB_FILE}" ${OBJ_FILES} ${OBJ_DIR}/%.o: ${top_dir}/testing/%.cpp ${H_FILES} $(info compile $@) @install -d "${OBJ_DIR}" - $(call _arduino_prop,compiler.cpp.cmd) -o "$@" -c \ + g++ -o "$@" -c \ -std=c++14 \ -I${top_dir} \ -I${top_dir}/src \