diff options
| author | David Tardon <dtardon@redhat.com> | 2017-10-27 22:17:35 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-10-28 10:43:19 +0200 |
| commit | 7a2e7c32d38db02aaa5d78d5e8aaf86cabfde586 (patch) | |
| tree | e15349217eed4ec47c6e31f1a8644f2c1d623da1 | |
| parent | 165d0a149d631d96a91118dfc7686bd2ebb0b6b9 (diff) | |
libwpd: always set CXXFLAGS
Change-Id: I211f346c428059e20dd1217b5b65fe8c1ab24710
Reviewed-on: https://gerrit.libreoffice.org/43968
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | external/libwpd/ExternalProject_libwpd.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index d897342e6b61..d01fb77188a0 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : $(if $(filter MACOSX,$(OS)), \ --prefix=/@.__________________________________________________OOO) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))") \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ |