diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-24 10:43:16 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-24 10:43:16 -0700 |
| commit | 10372259a9eeb97a02113b1e97b3e6bbfff67731 (patch) | |
| tree | d25dd22f1a880477198bb12221300e44af2c3884 /templates/Makefile.template | |
| parent | c9b3e5811e3d20c94f3397b0b092e641b6ab101e (diff) | |
| parent | 19def88839b15a89b4c0e79de16bd01139a0bb14 (diff) | |
Merge github.com:grpc/grpc into explain-the-things
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 66703f812b..2da884e262 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -673,11 +673,7 @@ third_party/protobuf/configure: $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a: third_party/protobuf/configure $(E) "[MAKE] Building protobuf" -ifeq ($(HAVE_CXX11),true) - $(Q)(cd third_party/protobuf ; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g" CXXFLAGS="-DLANG_CXX11 -std=c++11" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g" ./configure --disable-shared --enable-static) -else - $(Q)(cd third_party/protobuf ; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g" CXXFLAGS="-std=c++0x" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g" ./configure --disable-shared --enable-static) -endif + $(Q)(cd third_party/protobuf ; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g" ./configure --disable-shared --enable-static) $(Q)$(MAKE) -C third_party/protobuf clean $(Q)$(MAKE) -C third_party/protobuf $(Q)mkdir -p $(LIBDIR)/$(CONFIG)/protobuf |