From b72ca9b34df5f171da90059fd5cad0a66e84c07a Mon Sep 17 00:00:00 2001 From: Allen Webb Date: Wed, 20 Mar 2019 08:14:13 -0700 Subject: Makefile: fix compatibility with Protobuf 3.7.0 This defines PROTOBUF_MIN_PROTOC_VERSION so protobuf headers don't fail with -Wundef and sets -Wno-unreachable-code to allow for maps to be used in protocol buffers. BRANCH=None BUG=chromium:937442 TEST=make -j buildall Change-Id: Id595825c224e34df1034c26d49bb4f6263358470 Signed-off-by: Allen Webb Reviewed-on: https://chromium-review.googlesource.com/1531336 Commit-Ready: ChromeOS CL Exonerator Bot Reviewed-by: Mike Frysinger --- Makefile.rules | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index 207b7900fc..7c6f31847a 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -475,8 +475,10 @@ $(out)/RO/%.o:%.cc $(out)/RW/%.o:%.cc $(call quiet,cxx_to_o,CXX ) +$(out)/RO/%.pb.o: CXXFLAGS+= -Wno-unreachable-code $(out)/RO/%.pb.o:$(out)/gen/%.pb.cc $(call quiet,cxx_to_o,CXX ) +$(out)/RW/%.pb.o: CXXFLAGS+= -Wno-unreachable-code $(out)/RW/%.pb.o:$(out)/gen/%.pb.cc $(call quiet,cxx_to_o,CXX ) $(out)/gen/%.pb.cc:%.proto -- cgit v1.2.1