diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-24 08:32:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-01-24 11:25:03 +0100 |
| commit | c2216d2d7a5bb0a82f79181fbc46708d35858afe (patch) | |
| tree | d5391df6f89e4e3c24a49d31a834c38ce1354699 /external/icu | |
| parent | dc3936f598e828294311ceee738b4d8d3d46cf9e (diff) | |
Drop unnecessary gb_DEBUG_CFLAGS
...which was at maximum set to GCC's -finline-limit=0 -fno-inline
(solenv/gbuild/platform/com_GCC_defs.mk). Those options were set for debug
builds "since forever", but that looks very much like cargo cult: -fno-inline
"is the default when not optimizing" anyway
(<https://gcc.gnu.org/onlinedocs/gcc-7.4.0/gcc/Optimize-Options.html>), and it
is unclear to me how -finline-limit=0 should have any impact beyond -fno-inline
(and maybe was present for ancient compilers that only supported -finline-limit
but not -fno-inline?).
Change-Id: Id6752d03b1b7ec8763defabc5720d4dd08790874
Reviewed-on: https://gerrit.libreoffice.org/66836
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/icu')
| -rw-r--r-- | external/icu/ExternalProject_icu.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index ac5a12b00509..71f4f643bb45 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -21,7 +21,7 @@ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,icu,build) : $(call gb_ExternalProject_run,build,\ export LIB="$(ILIB)" \ - && CFLAGS="-FS -arch:SSE $(SOLARINC) $(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="-FS -arch:SSE $(SOLARINC) $(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS)" \ + && CFLAGS="-FS -arch:SSE $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="-FS -arch:SSE $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" \ INSTALL=`cygpath -m /usr/bin/install` \ ./runConfigureICU \ $(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug --disable-release) \ @@ -35,7 +35,6 @@ icu_CFLAGS:=" \ $(if $(filter iOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ $(if $(SYSBASE),-I$(SYSBASE)/usr/include) \ $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ - $(if $(debug),$(gb_DEBUG_CFLAGS)) \ $(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \ $(if $(filter GCC,$(COM)),-fno-strict-aliasing) \ $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \ @@ -44,7 +43,6 @@ icu_CFLAGS:=" \ icu_CXXFLAGS:="$(CXXFLAGS) $(CXXFLAGS_CXX11) \ $(if $(filter iOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ - $(if $(debug),$(gb_DEBUG_CFLAGS)) \ $(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \ $(if $(filter GCC,$(COM)),-fno-strict-aliasing) \ $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \ |