diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-23 17:57:44 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-01-23 21:06:51 +0100 |
| commit | 1dcdb9b538b3afb3e439d780baa15e5eba4af31f (patch) | |
| tree | eb98b70363123bc2e1dd7af58b8a878a39c64999 /external/libnumbertext | |
| parent | bcb1969f961874ccbcef7fc042b3cc164c8d2325 (diff) | |
Drop use of obsolete GCC -fno-default-inline
...that is documented as: "Does nothing. Preserved for backward compatibility."
ever since <https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=160384> from
2010.
-fno-default-inline was the only value ever set in gb_DEBUG_CXXFLAGS, so the
latter can be removed now.
The use of gb_DEBUG_CXXFLAGS had accidentally already been removed from
gb_LinkTarget__get_debugcxxflags with e751e24250fda31dde52b3c65ca79f86142dc789
"--enable-optimized should be orthogonal to --enable-debug/--enable-dbgutil",
and that leaves gb_LinkTarget__get_debugcflags and
gb_LinkTarget__get_debugcxxflags with identical definitions, so replace those
two with a single gb_LinkTarget__get_debugflags.
Some external modules had used only gb_DEBUG_CXXFLAGS, when this was apparently
meant to be used in addition to gb_DEBUG_CFLAGS, so those uses have been changed
to gb_DEBUG_CFLAGS now.
Change-Id: I84ea0ab1233569b0b02ca057240a71f138352381
Reviewed-on: https://gerrit.libreoffice.org/66808
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/libnumbertext')
| -rw-r--r-- | external/libnumbertext/ExternalProject_libnumbertext.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk index 679772700aad..52507d6e3dda 100644 --- a/external/libnumbertext/ExternalProject_libnumbertext.mk +++ b/external/libnumbertext/ExternalProject_libnumbertext.mk @@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,libnumbertext,build): $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ $(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \ $(if $(libnumbertext_CPPFLAGS),CPPFLAGS='$(libnumbertext_CPPFLAGS)') \ - CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \ + CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \ && cd src && $(MAKE) \ ) |