From 5ff6caffa46c4137d14375426cf8d7bd7187b424 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 4 May 2021 13:11:23 -0700 Subject: Makefile: Update C++ compile command Update cmd_cxx_to_host to match current cmd_c_to_host. Switch HOSTCXX to clang++ to match "CXX" in Makefile.toolchain (and the toolchain that we use in the rest of Chrome OS). Add "-std=gnu++17" to match the C++ standard that we use in the rest of Chrome OS. Followup commits will make use of these changes. BRANCH=none BUG=b:144959033 TEST=make buildall Signed-off-by: Tom Hughes Change-Id: I5878ae64dc5ac76db22b3c331915b191a00f4257 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2872429 Reviewed-by: Eric Yilun Lin --- Makefile.rules | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index e80f1cc94a..01913a82ea 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -104,8 +104,9 @@ cmd_c_to_vif = $(BUILDCC) $(BUILD_CFLAGS) $(STANDALONE_FLAGS) \ -MMD -MF $@.d -c $< -flto -MT $@ -o $@ cmd_c_to_host = $(HOSTCC) $(HOST_CFLAGS) -MMD -MF $@.d -MT $@ -o $@ \ $(sort $(foreach c,$($(*F)-objs),util/$(c:%.o=%.c)) $(wildcard $*.c)) $(HOST_LDFLAGS) -cmd_cxx_to_host = $(HOSTCXX) -std=c++0x $(COMMON_WARN) $(HOST_CXXFLAGS)\ - -I ./$($(notdir $@)_ROOT) -o $@ $(filter %.cc,$^) $($(notdir $@)_LIBS) +cmd_cxx_to_host = $(HOSTCXX) -std=gnu++17 $(HOST_CXXFLAGS) \ + -MMD -MF $@.d -MT $@ -o $@ \ + $(sort $(foreach c,$($(*F)-objs),util/$(c:%.o=%.cc)) $(wildcard $*.cc)) $(HOST_LDFLAGS) cmd_o_to_a = $(AR) rcs $@ $^ cmd_host_test = $(MAKE) BOARD=host PROJECT=$* \ V=$(V) out=build/host/$* TEST_BUILD=y EMU_BUILD=y CROSS_COMPILE= \ -- cgit v1.2.1