From eedcea98335b518a8bea9f4c654713add86e6e9c Mon Sep 17 00:00:00 2001 From: Dan Kegel Date: Thu, 3 Jan 2019 14:06:52 -0800 Subject: [PATCH 1/2] Avoid including old installed headers. Fixes issue 17620. --- templates/Makefile.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Makefile.template b/templates/Makefile.template index 8bb06176bf8..31cf14a71c1 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -715,7 +715,7 @@ ifeq ($(HAS_PKG_CONFIG),true) PROTOBUF_PKG_CONFIG = true PC_REQUIRES_GRPCXX = protobuf - CPPFLAGS := $(shell $(PKG_CONFIG) --cflags protobuf) $(CPPFLAGS) + CPPFLAGS := $(CPPFLAGS) $(shell $(PKG_CONFIG) --cflags protobuf) LDFLAGS_PROTOBUF_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L protobuf) ifeq ($(SYSTEM),Linux) ifneq ($(LDFLAGS_PROTOBUF_PKG_CONFIG),) From 0961c2ac5127ff6d844813433fd99556b5faf740 Mon Sep 17 00:00:00 2001 From: Dan Kegel Date: Thu, 3 Jan 2019 14:08:05 -0800 Subject: [PATCH 2/2] Makefile: regenerate. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b8a1c921862..dec46efcb60 100644 --- a/Makefile +++ b/Makefile @@ -809,7 +809,7 @@ ifeq ($(HAS_SYSTEM_PROTOBUF),true) ifeq ($(HAS_PKG_CONFIG),true) PROTOBUF_PKG_CONFIG = true PC_REQUIRES_GRPCXX = protobuf -CPPFLAGS := $(shell $(PKG_CONFIG) --cflags protobuf) $(CPPFLAGS) +CPPFLAGS := $(CPPFLAGS) $(shell $(PKG_CONFIG) --cflags protobuf) LDFLAGS_PROTOBUF_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L protobuf) ifeq ($(SYSTEM),Linux) ifneq ($(LDFLAGS_PROTOBUF_PKG_CONFIG),)