summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2017-12-07 22:21:49 +0100
committerMichael Stahl <mstahl@redhat.com>2017-12-08 14:07:15 +0100
commit52d813137a16b5686180b446321003765751fc8d (patch)
treee142809fd21d4ef4043654095a3118543d76f85e /external
parent6f609433730ecdbc23096b9362df596a0b703d37 (diff)
gpg4libre: also pass proper dbgutil flags down to gpgmepp
Change-Id: I63ca514b6bf7e1316ebbaa3cd399fd9f9447bc7f Reviewed-on: https://gerrit.libreoffice.org/46049 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 8976e546909be0e523dbaf6581c53c1d5b44a1d0) Reviewed-on: https://gerrit.libreoffice.org/46068 Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external')
-rw-r--r--external/gpgmepp/ExternalProject_gpgmepp.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk
index a10d41556b0c..ec865fcb2ca8 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -62,7 +62,8 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
CXXFLAGS='$(CXXFLAGS) \
$(if $(ENABLE_OPTIMIZED), \
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
- $(if $(ENABLE_DEBUG),$(gb_DEBUG_CXXFLAGS) -D_GLIBCXX_DEBUG) \
+ $(if $(ENABLE_DEBUG),$(gb_DEBUG_CXXFLAGS)) \
+ $(if $(ENABLE_DBGUTIL),-D_GLIBCXX_DEBUG) \
$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
$(if $(filter LINUX,$(OS)), \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \