Merge pull request #286 from nicolasnoble/no-stripping

Let's not strip libraries if compiled in anything other than release.
pull/289/head
Craig Tiller 10 years ago
commit 14a2b8d1f4
  1. 8
      Makefile
  2. 8
      templates/Makefile.template

@ -1006,28 +1006,36 @@ strip-shared: strip-shared_c strip-shared_cxx
# This prevents proper debugging after running make install.
strip-static_c: static_c
ifeq ($(CONFIG),opt)
$(E) "[STRIP] Stripping libgpr.a"
$(Q) $(STRIP) libs/$(CONFIG)/libgpr.a
$(E) "[STRIP] Stripping libgrpc.a"
$(Q) $(STRIP) libs/$(CONFIG)/libgrpc.a
$(E) "[STRIP] Stripping libgrpc_unsecure.a"
$(Q) $(STRIP) libs/$(CONFIG)/libgrpc_unsecure.a
endif
strip-static_cxx: static_cxx
ifeq ($(CONFIG),opt)
$(E) "[STRIP] Stripping libgrpc++.a"
$(Q) $(STRIP) libs/$(CONFIG)/libgrpc++.a
endif
strip-shared_c: shared_c
ifeq ($(CONFIG),opt)
$(E) "[STRIP] Stripping libgpr.so"
$(Q) $(STRIP) libs/$(CONFIG)/libgpr.$(SHARED_EXT)
$(E) "[STRIP] Stripping libgrpc.so"
$(Q) $(STRIP) libs/$(CONFIG)/libgrpc.$(SHARED_EXT)
$(E) "[STRIP] Stripping libgrpc_unsecure.so"
$(Q) $(STRIP) libs/$(CONFIG)/libgrpc_unsecure.$(SHARED_EXT)
endif
strip-shared_cxx: shared_cxx
ifeq ($(CONFIG),opt)
$(E) "[STRIP] Stripping libgrpc++.so"
$(Q) $(STRIP) libs/$(CONFIG)/libgrpc++.$(SHARED_EXT)
endif
gens/examples/tips/empty.pb.cc: examples/tips/empty.proto $(PROTOC_PLUGINS)
$(E) "[PROTOC] Generating protobuf CC file from $<"

@ -481,6 +481,7 @@ strip-shared: strip-shared_c strip-shared_cxx
# This prevents proper debugging after running make install.
strip-static_c: static_c
ifeq ($(CONFIG),opt)
% for lib in libs:
% if lib.language == "c":
% if lib.build == "all":
@ -489,8 +490,10 @@ strip-static_c: static_c
% endif
% endif
% endfor
endif
strip-static_cxx: static_cxx
ifeq ($(CONFIG),opt)
% for lib in libs:
% if lib.language == "c++":
% if lib.build == "all":
@ -499,8 +502,10 @@ strip-static_cxx: static_cxx
% endif
% endif
% endfor
endif
strip-shared_c: shared_c
ifeq ($(CONFIG),opt)
% for lib in libs:
% if lib.language == "c":
% if lib.build == "all":
@ -509,8 +514,10 @@ strip-shared_c: shared_c
% endif
% endif
% endfor
endif
strip-shared_cxx: shared_cxx
ifeq ($(CONFIG),opt)
% for lib in libs:
% if lib.language == "c++":
% if lib.build == "all":
@ -519,6 +526,7 @@ strip-shared_cxx: shared_cxx
% endif
% endif
% endfor
endif
% for p in protos:
gens/${p}.pb.cc: ${p}.proto $(PROTOC_PLUGINS)

Loading…
Cancel
Save