Revert "No longer hardcode ar and c++ in libcommon.mk"

This reverts commit f9b756ff5d637ba9e1c52ff6569fa4d8dc545720.
tmp/arduino-cli-pre-rebase
Jesse Vincent 4 years ago
parent 4af76348d6
commit 3a68baca25
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -1,7 +1,6 @@
top_dir := $(abspath $(dir $(lastword ${MAKEFILE_LIST}))../..) top_dir := $(abspath $(dir $(lastword ${MAKEFILE_LIST}))../..)
build_dir := ${top_dir}/_build build_dir := ${top_dir}/_build
include $(top_dir)/etc/makefiles/arduino-cli.mk
bundle_path = ${ARDUINO_DIRECTORIES_USER}/hardware/keyboardio/avr/libraries 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} ${LIB_DIR}/${LIB_FILE}: ${OBJ_FILES}
@install -d "${LIB_DIR}" @install -d "${LIB_DIR}"
$(call _arduino_prop,compiler.ar.cmd) \ ar rcs "${LIB_DIR}/${LIB_FILE}" ${OBJ_FILES}
$(call _arduino_prop,compiler.ar.flags) "${LIB_DIR}/${LIB_FILE}" ${OBJ_FILES}
${OBJ_DIR}/%.o: ${top_dir}/testing/%.cpp ${H_FILES} ${OBJ_DIR}/%.o: ${top_dir}/testing/%.cpp ${H_FILES}
$(info compile $@) $(info compile $@)
@install -d "${OBJ_DIR}" @install -d "${OBJ_DIR}"
$(call _arduino_prop,compiler.cpp.cmd) -o "$@" -c \ g++ -o "$@" -c \
-std=c++14 \ -std=c++14 \
-I${top_dir} \ -I${top_dir} \
-I${top_dir}/src \ -I${top_dir}/src \

Loading…
Cancel
Save