aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-01-29 21:33:32 +0100
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-01-29 21:33:32 +0100
commit3a2551c0bd385ae6ec79772ae3f0f8846cb509f2 (patch)
treea9b6422b886a8f763c13a1aa054445415bb1d767
parent8299760ca0c9f7bfb4d80ab4717d7649934df4c6 (diff)
Let's not strip libraries if compiled in anything other than release.
Hopefully works around #90.
-rw-r--r--Makefile8
-rw-r--r--templates/Makefile.template8
2 files changed, 16 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f4615a21a4..d46bf2cb1e 100644
--- a/Makefile
+++ b/Makefile
@@ -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 $<"
diff --git a/templates/Makefile.template b/templates/Makefile.template
index b80e80ca81..a127696d40 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -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)