diff options
| author | Allen Webb <allenwebb@google.com> | 2019-03-20 08:14:13 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-21 08:07:19 -0700 |
| commit | b72ca9b34df5f171da90059fd5cad0a66e84c07a (patch) | |
| tree | 86bec0f1b9a42e1f45e8a46e53e3453507ef2df5 /Makefile.rules | |
| parent | e44382613539fbf3abbe8b9047aa57536ba8fd82 (diff) | |
| download | chrome-ec-b72ca9b34df5f171da90059fd5cad0a66e84c07a.tar.gz | |
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 <allenwebb@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1531336
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 2 |
1 files changed, 2 insertions, 0 deletions
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 |