Skip to content
Snippets Groups Projects
Commit f4fb8e08 authored by Nicolas Noble's avatar Nicolas Noble
Browse files

Merge pull request #699 from ctiller/mac3 

Fix in tree build of protobuf
parents 1426a23c 9ec95faf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile
+ 2
− 2
View file @ f4fb8e08
...@@ -315,8 +315,8 @@ LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE)) ...@@ -315,8 +315,8 @@ LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE))
ifeq ($(HAS_SYSTEM_PROTOBUF),false) ifeq ($(HAS_SYSTEM_PROTOBUF),false)
ifeq ($(HAS_EMBEDDED_PROTOBUF),true) ifeq ($(HAS_EMBEDDED_PROTOBUF),true)
PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a
CPPFLAGS += -Ithird_party/protobuf/src CPPFLAGS := -Ithird_party/protobuf/src $(CPPFLAGS)
LDFLAGS += -L$(LIBDIR)/$(CONFIG)/protobuf LDFLAGS := -L$(LIBDIR)/$(CONFIG)/protobuf $(LDFLAGS)
PROTOC = $(BINDIR)/$(CONFIG)/protobuf/protoc PROTOC = $(BINDIR)/$(CONFIG)/protobuf/protoc
else else
NO_PROTOBUF = true NO_PROTOBUF = true
templates/Makefile.template
+ 2
− 2
View file @ f4fb8e08
...@@ -332,8 +332,8 @@ LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE)) ...@@ -332,8 +332,8 @@ LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE))
ifeq ($(HAS_SYSTEM_PROTOBUF),false) ifeq ($(HAS_SYSTEM_PROTOBUF),false)
ifeq ($(HAS_EMBEDDED_PROTOBUF),true) ifeq ($(HAS_EMBEDDED_PROTOBUF),true)
PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a
CPPFLAGS += -Ithird_party/protobuf/src CPPFLAGS := -Ithird_party/protobuf/src $(CPPFLAGS)
LDFLAGS += -L$(LIBDIR)/$(CONFIG)/protobuf LDFLAGS := -L$(LIBDIR)/$(CONFIG)/protobuf $(LDFLAGS)
PROTOC = $(BINDIR)/$(CONFIG)/protobuf/protoc PROTOC = $(BINDIR)/$(CONFIG)/protobuf/protoc
else else
NO_PROTOBUF = true NO_PROTOBUF = true
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment