summaryrefslogtreecommitdiff
path: root/Makefile.toolchain
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2021-05-04 13:11:23 -0700
committerCommit Bot <commit-bot@chromium.org>2021-05-05 23:30:20 +0000
commit5ff6caffa46c4137d14375426cf8d7bd7187b424 (patch)
treed8bec09b6bc39b58b41cb5cc7036c4c2b4cbef0a /Makefile.toolchain
parentbfa6f4ddad316ef5b13497504680e25579464be3 (diff)
downloadchrome-ec-5ff6caffa46c4137d14375426cf8d7bd7187b424.tar.gz
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 <tomhughes@chromium.org> Change-Id: I5878ae64dc5ac76db22b3c331915b191a00f4257 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2872429 Reviewed-by: Eric Yilun Lin <yllin@google.com>
Diffstat (limited to 'Makefile.toolchain')
-rw-r--r--Makefile.toolchain3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.toolchain b/Makefile.toolchain
index 84c9e81660..e39a1c3016 100644
--- a/Makefile.toolchain
+++ b/Makefile.toolchain
@@ -44,7 +44,7 @@ ADDR2LINE=$(CROSS_COMPILE)addr2line
PKG_CONFIG?=pkg-config
BUILDCC?=$(CCACHE) gcc
HOSTCC?=$(CCACHE) $(HOST_CROSS_COMPILE)gcc
-HOSTCXX?=$(CCACHE) $(HOST_CROSS_COMPILE)g++
+HOSTCXX?=$(CCACHE) $(HOST_CROSS_COMPILE)clang++
HOST_PKG_CONFIG?=$(HOST_CROSS_COMPILE)pkg-config
PROTOC?=protoc
@@ -138,6 +138,7 @@ HOST_CFLAGS=$(HOST_CPPFLAGS) -O3 $(CFLAGS_DEBUG) $(CFLAGS_WARN) \
-DHOST_TOOLS_BUILD=$(EMPTY)
HOST_CFLAGS+=$(LIBFTDIUSB_CFLAGS)
HOST_CFLAGS+=-DCHROMIUM_EC=$(EMPTY)
+HOST_CXXFLAGS=$(HOST_CFLAGS)
ifneq (${SYSROOT},)
LDFLAGS_EXTRA+=--sysroot=${SYSROOT}
endif