From d5191a5f8bee46762285b2668c19890390351001 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sat, 3 Aug 2019 01:44:02 +0200 Subject: [PATCH] Adding src/core/ext/upb-generated in our include path. This enables us to build both from Bazel and make. --- Makefile | 2 +- templates/Makefile.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3cef3bc5e10..fd9d5521a17 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/templates/Makefile.template b/templates/Makefile.template index a46a27061ab..21e1b6cd01c 100644 --- 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)