diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-20 20:36:21 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-20 20:36:21 -0800 |
| commit | 9ec95fafdce16c2fbc1ac8b598e1483340c00f6e (patch) | |
| tree | b6cb79c1314956744bcd83b69cdc8469df200e59 /templates/Makefile.template | |
| parent | 1426a23c181d9ffd8a11e96cf2f5b5c4a1380bb2 (diff) | |
Fix in tree build of protobuf
If we are building protobuf because of an incompatible out of tree protobuf installation, then make sure that we don't accidentally use that versions includes.
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 60416525f8..a93e23638d 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -332,8 +332,8 @@ LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE)) ifeq ($(HAS_SYSTEM_PROTOBUF),false) ifeq ($(HAS_EMBEDDED_PROTOBUF),true) PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a -CPPFLAGS += -Ithird_party/protobuf/src -LDFLAGS += -L$(LIBDIR)/$(CONFIG)/protobuf +CPPFLAGS := -Ithird_party/protobuf/src $(CPPFLAGS) +LDFLAGS := -L$(LIBDIR)/$(CONFIG)/protobuf $(LDFLAGS) PROTOC = $(BINDIR)/$(CONFIG)/protobuf/protoc else NO_PROTOBUF = true |