summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.rules2
-rw-r--r--Makefile.toolchain3
2 files changed, 4 insertions, 1 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
diff --git a/Makefile.toolchain b/Makefile.toolchain
index 18ad2b443d..f6fa2b51eb 100644
--- a/Makefile.toolchain
+++ b/Makefile.toolchain
@@ -78,7 +78,8 @@ CFLAGS_DEFINE=-DOUTDIR=$(out)/$(BLD) -DCHIP=$(CHIP) -DBOARD_TASKFILE=$(_tsk_lst_
-DCHIP_VARIANT=$(CHIP_VARIANT) -DCHIP_FAMILY=$(CHIP_FAMILY) \
-DBOARD_$(UC_BOARD) -DCHIP_$(UC_CHIP) -DCORE_$(UC_CORE) \
-DCHIP_VARIANT_$(UC_CHIP_VARIANT) -DCHIP_FAMILY_$(UC_CHIP_FAMILY) \
- -DFINAL_OUTDIR=$(out) $(CFLAGS_BASEBOARD)
+ -DFINAL_OUTDIR=$(out) -DPROTOBUF_MIN_PROTOC_VERSION=0 \
+ $(CFLAGS_BASEBOARD)
CPPFLAGS=$(CFLAGS_DEFINE) $(CFLAGS_INCLUDE) $(CFLAGS_TEST) \
$(EXTRA_CFLAGS) $(CFLAGS_COVERAGE) $(LATE_CFLAGS_DEFINE) \
-DSECTION_IS_$(BLD) -DSECTION=$(BLD) $(CPPFLAGS_$(BLD))