diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-10-11 22:28:06 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-10-11 23:33:30 +0200 |
| commit | 5b2848413883565c48d312c96daf8fbca25405d8 (patch) | |
| tree | 330ef4b24f688248bdf65c6cfeeb9c31183c6cc9 /solenv/gbuild/LinkTarget.mk | |
| parent | 9402579be9d9a8888af03291edd2478a716f901a (diff) | |
clang does not support -flto=<number>
This may happen when building with GCC when Clang is used for Skia
and --with-parallelism is in effect.
Change-Id: Ic52dbbcf53253ed73413af4ea8254b000eee72d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123430
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'solenv/gbuild/LinkTarget.mk')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index e047eeff2cc0..6c08c603267a 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -91,7 +91,7 @@ $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CC) \ $(DEFS) \ - $(gb_LTOFLAGS) \ + $(T_LTOFLAGS) \ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if $(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR)) \ $(if $(3),$(gb_COMPILER_PLUGINS)) \ @@ -106,7 +106,7 @@ $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CC) \ $(DEFS) \ - $(gb_LTOFLAGS) \ + $(T_LTOFLAGS) \ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if $(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR)) \ $(if $(3),$(gb_COMPILER_PLUGINS)) \ @@ -121,7 +121,7 @@ $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CXX) \ $(DEFS) \ - $(gb_LTOFLAGS) \ + $(T_LTOFLAGS) \ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if $(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR)) \ $(if $(3),$(gb_COMPILER_PLUGINS)) \ @@ -136,7 +136,7 @@ $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CXX) \ $(DEFS) \ - $(gb_LTOFLAGS) \ + $(T_LTOFLAGS) \ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if $(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR)) \ $(if $(3),$(gb_COMPILER_PLUGINS)) \ @@ -151,7 +151,7 @@ $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CXX) \ $(DEFS) \ - $(gb_LTOFLAGS) \ + $(T_LTOFLAGS) \ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if $(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR)) \ $(if $(3),$(gb_COMPILER_PLUGINS)) \ @@ -971,6 +971,7 @@ $(call gb_LinkTarget_get_target,$(1)) : T_FORCE_COMPILE := $(if $(call gb_LinkTa $(call gb_LinkTarget_get_target,$(1)) : T_CC := $(call gb_LinkTarget_get_target,$(1)) : T_CXX := $(call gb_LinkTarget_get_target,$(1)) : T_USE_LD := $(USE_LD) +$(call gb_LinkTarget_get_target,$(1)) : T_LTOFLAGS := $(gb_LTOFLAGS) ifeq ($(gb_FULLDEPS),$(true)) ifeq (depcache:,$(filter depcache,$(.FEATURES)):$(gb_PARTIAL_BUILD)) @@ -1985,6 +1986,7 @@ define gb_LinkTarget_use_clang $(call gb_LinkTarget_get_target,$(1)) : T_CC := $(LO_CLANG_CC) $(call gb_LinkTarget_get_target,$(1)) : T_CXX := $(LO_CLANG_CXX) $(call gb_LinkTarget_get_target,$(1)) : T_USE_LD := $(or $(CLANG_USE_LD),$(USE_LD)) +$(call gb_LinkTarget_get_target,$(1)) : T_LTOFLAGS := $(or $(gb_CLANG_LTOFLAGS),$(gb_LTOFLAGS)) endef # call gb_LinkTarget_use_glxtest,linktarget,add_libs |