summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-10-28 15:50:23 +0200
committerDavid Tardon <dtardon@redhat.com>2017-10-29 08:31:03 +0100
commitd19eeee50eb944325806af75ede5c0542ac68787 (patch)
treedaa6a0660aaa77dfc4e0cdb7acfd85a5898319ac /external
parentba27efc27faa0d26fc8c5d5f790807d0c036cddb (diff)
libodfgen: pass optimization flags to configure
Change-Id: I23aa89602206bedf3b1faf58c5e153a4d06cb515 Reviewed-on: https://gerrit.libreoffice.org/43997 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/libodfgen/ExternalProject_libodfgen.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk
index ae6ab610f119..c02b4f532d65 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -35,7 +35,8 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
--without-docs \
--with-sharedptr=c++11 \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
- CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \
+ CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
+ CPPFLAGS="$(CPPFLAGS) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \
$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \