Merge pull request #19840 from nicolasnoble/fix-include-path-for-upb

Adding src/core/ext/upb-generated in our include path.
5 years ago · 185ab84528
parent 73a3ff8804 d5191a5f8b
commit 185ab84528
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -370,7 +370,7 @@ CPPFLAGS += -fPIC
 LDFLAGS += -fPIC
 endif

-INCLUDES = . include $(GENDIR) third_party/upb third_party/upb/generated_for_cmake
+INCLUDES = . include $(GENDIR) third_party/upb third_party/upb/generated_for_cmake src/core/ext/upb-generated
 LDFLAGS += -Llibs/$(CONFIG)

 ifeq ($(SYSTEM),Darwin)
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@ -240,7 +240,7 @@
  LDFLAGS += -fPIC
  endif

-  INCLUDES = . include $(GENDIR) third_party/upb third_party/upb/generated_for_cmake
+  INCLUDES = . include $(GENDIR) third_party/upb third_party/upb/generated_for_cmake src/core/ext/upb-generated
  LDFLAGS += -Llibs/$(CONFIG)

  ifeq ($(SYSTEM),Darwin)