summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-10-31 14:01:42 +0100
committerLuboš Luňák <l.lunak@suse.cz>2012-10-31 14:05:27 +0100
commitad3f2bd585706d0880b75c8cbf8302104756dc3c (patch)
tree0ae352aa2435577de63d936745a4c47f947ec2e6
parent069704d390d70afe507b5f049a472a6aefaed64d (diff)
do not strip debuginfo if any explicit C(XX)FLAGS have been given
Because there may be -g explicitly specified there. This is in line with using buildsystem's -O/-g flags only if nothing has been explicitly specified. Change-Id: If0309b6a7c52de19c4903978108e4e24362d3351
-rw-r--r--solenv/gbuild/LinkTarget.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index ba91d4ae4ff6..4b47c83ec398 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -50,7 +50,7 @@ gb_LinkTarget__get_debugcxxflags=$(if $(call gb_LinkTarget__debug_enabled,$(1)),
# similar for LDFLAGS, use linker optimization flags in non-debug case,
# but moreover strip debug from libraries for which debuginfo is not wanted
# (some libraries reuse .o files from other libraries, notably unittests)
-gb_LinkTarget__get_stripldflags=$(if $(call gb_LinkTarget__debug_enabled,$(1)),,$(gb_LINKERSTRIPDEBUGFLAGS))
+gb_LinkTarget__get_stripldflags=$(if $(strip $(CFLAGS)$(CXXFLAGS)$(OBJCFLAGS)$(OBJCXXFLAGS)$(LDFLAGS)),,$(gb_LINKERSTRIPDEBUGFLAGS))
gb_LinkTarget__get_debugldflags=$(if $(call gb_LinkTarget__debug_enabled,$(1)),,$(gb_LINKEROPTFLAGS) $(call gb_LinkTarget__get_stripldflags,$(1)))
# generic cflags/cxxflags to use (optimization flags, debug flags)