diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | external/gpgmepp/ExternalProject_gpgmepp.mk | 2 | ||||
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk | 2 | ||||
| -rw-r--r-- | external/hunspell/ExternalProject_hunspell.mk | 2 | ||||
| -rw-r--r-- | external/libnumbertext/ExternalProject_libnumbertext.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 13 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.help.txt | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 6 |
9 files changed, 11 insertions, 34 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index aa64c32b77ab..2056ce282bb3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -250,7 +250,6 @@ export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@ export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@ export HAVE_GCC_BUILTIN_FFS=@HAVE_GCC_BUILTIN_FFS@ export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@ -export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@ export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@ export HAVE_GCC_FNO_INLINE=@HAVE_GCC_FNO_INLINE@ export HAVE_GCC_FNO_SIZED_DEALLOCATION=@HAVE_GCC_FNO_SIZED_DEALLOCATION@ diff --git a/configure.ac b/configure.ac index 19f1f5803d5e..a0cda0719711 100644 --- a/configure.ac +++ b/configure.ac @@ -6711,22 +6711,8 @@ dnl =================================================================== dnl Clang++ tests dnl =================================================================== -HAVE_GCC_FNO_DEFAULT_INLINE= HAVE_GCC_FNO_ENFORCE_EH_SPECS= if test "$GCC" = "yes"; then - AC_MSG_CHECKING([whether $CXX supports -fno-default-inline]) - AC_LANG_PUSH([C++]) - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CFLAGS -Werror -fno-default-inline" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_FNO_DEFAULT_INLINE=TRUE ],[]) - CXXFLAGS=$save_CXXFLAGS - AC_LANG_POP([C++]) - if test "$HAVE_GCC_FNO_DEFAULT_INLINE" = "TRUE"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - AC_MSG_CHECKING([whether $CXX supports -fno-enforce-eh-specs]) AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS @@ -6740,7 +6726,6 @@ if test "$GCC" = "yes"; then AC_MSG_RESULT([no]) fi fi -AC_SUBST(HAVE_GCC_FNO_DEFAULT_INLINE) AC_SUBST(HAVE_GCC_FNO_ENFORCE_EH_SPECS) dnl =================================================================== diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index 452f922750d6..703783bf1854 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): CXXFLAGS='$(CXXFLAGS) \ $(if $(ENABLE_OPTIMIZED), \ $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ - $(if $(ENABLE_DEBUG),$(gb_DEBUG_CXXFLAGS)) \ + $(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \ $(if $(ENABLE_DBGUTIL),-D_GLIBCXX_DEBUG) \ $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \ $(if $(filter LINUX,$(OS)), \ diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index ad5c187ba4c5..4fab439641fb 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -47,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \ $(if $(ENABLE_OPTIMIZED), \ $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ - $(if $(debug),$(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS)) \ + $(if $(debug),$(gb_DEBUG_CFLAGS)) \ $(CXXFLAGS) $(CXXFLAGS_CXX11) \ $(ICU_UCHAR_TYPE) \ $(if $(filter LINUX,$(OS)),-fvisibility=hidden)' \ diff --git a/external/hunspell/ExternalProject_hunspell.mk b/external/hunspell/ExternalProject_hunspell.mk index 375092bf390a..7afa04bf893d 100644 --- a/external/hunspell/ExternalProject_hunspell.mk +++ b/external/hunspell/ExternalProject_hunspell.mk @@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,hunspell,build): $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ $(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \ $(if $(hunspell_CPPFLAGS),CPPFLAGS='$(hunspell_CPPFLAGS)') \ - CXXFLAGS="$(CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS))" \ + CXXFLAGS="$(CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS))" \ && cd src/hunspell && $(MAKE) \ ) 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) \ ) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 96be7ad5f01c..b9ea5f55ec3d 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -44,8 +44,7 @@ gb_LinkTarget__debug_enabled = \ # debug flags, if ENABLE_DEBUG is set and the LinkTarget is named # in the list of libraries of ENABLE_DEBUGINFO_FOR -gb_LinkTarget__get_debugcflags=$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(call gb_LinkTarget__debug_enabled,$(1)),$(gb_DEBUG_CFLAGS)) $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) -gb_LinkTarget__get_debugcxxflags=$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(call gb_LinkTarget__debug_enabled,$(1)),$(gb_DEBUG_CFLAGS)) $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) +gb_LinkTarget__get_debugflags=$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(call gb_LinkTarget__debug_enabled,$(1)),$(gb_DEBUG_CFLAGS)) $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) # similar for LDFLAGS, use linker optimization flags in non-debug case, # but moreover strip debug from libraries for which debuginfo is not wanted @@ -56,11 +55,11 @@ gb_LinkTarget__get_debugldflags=$(if $(call gb_LinkTarget__debug_enabled,$(1)),, # generic cflags/cxxflags to use (optimization flags, debug flags) # user supplied CFLAGS/CXXFLAGS override default debug/optimization flags # call gb_LinkTarget__get_cflags,linktargetmakefilename -gb_LinkTarget__get_cflags=$(if $(CFLAGS),$(CFLAGS),$(call gb_LinkTarget__get_debugcflags,$(1))) -gb_LinkTarget__get_objcflags=$(if $(OBJCFLAGS),$(OBJCFLAGS),$(call gb_LinkTarget__get_debugcflags,$(1))) -gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1))) -gb_LinkTarget__get_objcxxflags=$(if $(OBJCXXFLAGS),$(OBJCXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1))) -gb_LinkTarget__get_cxxclrflags=$(call gb_LinkTarget__get_debugcxxflags,$(1)) +gb_LinkTarget__get_cflags=$(if $(CFLAGS),$(CFLAGS),$(call gb_LinkTarget__get_debugflags,$(1))) +gb_LinkTarget__get_objcflags=$(if $(OBJCFLAGS),$(OBJCFLAGS),$(call gb_LinkTarget__get_debugflags,$(1))) +gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__get_debugflags,$(1))) +gb_LinkTarget__get_objcxxflags=$(if $(OBJCXXFLAGS),$(OBJCXXFLAGS),$(call gb_LinkTarget__get_debugflags,$(1))) +gb_LinkTarget__get_cxxclrflags=$(call gb_LinkTarget__get_debugflags,$(1)) # call gb_LinkTarget__get_ldflags,linktargetmakefilename gb_LinkTarget__get_ldflags=$(if $(LDFLAGS),$(LDFLAGS),$(call gb_LinkTarget__get_debugldflags,$(1))) diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt index 51094b42ae50..665feb578fb1 100644 --- a/solenv/gbuild/gbuild.help.txt +++ b/solenv/gbuild/gbuild.help.txt @@ -132,7 +132,7 @@ INTERACTIVE VARIABLES: CXXFLAGS Override compiler flags for C++ compilation. Note: this overrides default optimization and debug flags; to append flags without overriding, use: - CXXFLAGS='$(call gb_LinkTarget__get_debugcxxflags,$(1)) -Wfoo' + CXXFLAGS='$(call gb_LinkTarget__get_debugflags,$(1)) -Wfoo' ENVCFLAGSCXX Append compiler flags for C++ compilation. OBJCFLAGS Override compiler flags for Objective C compilation. OBJCXXFLAGS Override compiler flags for Objective C++ compilation. diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 14d82ccdc0e2..5698e70d53f8 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -212,13 +212,7 @@ ifeq ($(HAVE_GCC_FNO_INLINE),TRUE) FNO_INLINE=-fno-inline endif -ifeq ($(HAVE_GCC_FNO_DEFAULT_INLINE),TRUE) -FNO_DEFAULT_INLINE=-fno-default-inline -endif - gb_DEBUG_CFLAGS := $(FINLINE_LIMIT0) $(FNO_INLINE) -gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE) - gb_LinkTarget_INCLUDE :=\ $(SOLARINC) \ |