summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2020-11-20 14:14:46 -0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-09-22 01:30:22 +0000
commit0e426b12b8982d2196a0ba8dc08cdb94f81839f5 (patch)
tree6b711a871ed8acd5da0f14ac2ba2e90a05b49d12 /Makefile
parent229b358f694febb91ac0265850da8c52df588bd8 (diff)
downloadchrome-ec-0e426b12b8982d2196a0ba8dc08cdb94f81839f5.tar.gz
util: Compile ectool (and other utils) with C++
The utils only run on the host, so we have no restrictions on compiler. Use C++ so that ectool can use "libec". BRANCH=none BUG=b:144959033 TEST=make buildall Force-Relevant-Builds: all Signed-off-by: Tom Hughes <tomhughes@chromium.org> Change-Id: I44b9bb25b2659b678bc4b71e203a1901eff51b13 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2556757 Reviewed-by: Yuval Peress <peress@google.com> Code-Coverage: Yuval Peress <peress@google.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5dc693c793..a2467ce094 100644
--- a/Makefile
+++ b/Makefile
@@ -345,12 +345,15 @@ $(eval $(call get_sources,ro))
# See commit bc4c1b4 for more context.
build-utils := $(call objs_from_dir,$(out)/util,build-util-bin)
host-utils := $(call objs_from_dir,$(out)/util,host-util-bin)
+host-utils-cxx := $(call objs_from_dir,$(out)/util,host-util-bin-cxx)
build-art := $(call objs_from_dir,$(out),build-util-art)
# Use the util_name with an added .c AND the special <util_name>-objs variable.
build-srcs := $(foreach u,$(build-util-bin-y),$(sort $($(u)-objs:%.o=util/%.c) \
$(wildcard util/$(u).c)))
host-srcs := $(foreach u,$(host-util-bin-y),$(sort $($(u)-objs:%.o=util/%.c) \
$(wildcard util/$(u).c)))
+host-srcs-cxx := $(foreach u,$(host-util-bin-cxx-y), \
+ $(sort $($(u)-objs:%.o=util/%.cc) $(wildcard util/$(u).cc)))
dirs=core/$(CORE) chip/$(CHIP) $(BASEDIR) $(BDIR) common fuzz power test \
cts/common cts/$(CTS_MODULE) $(out)/gen