diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-10-08 12:56:46 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-10-11 08:16:02 +0200 |
| commit | c53a8aef805e59bbafb1943e5be49a6529645638 (patch) | |
| tree | f58ba3cd4ddaa4e3ddb9c2c9d63bad56aa64ae83 /solenv | |
| parent | cca8c5ad553e21bd55aef93757cd31626f9beba1 (diff) | |
merge LD_PLUGIN use with other LTO use
It seems LD_PLUGIN predates the other --plugin usage, so make
that one use LD_PLUGIN instead of using --plugin twice.
Change-Id: I00133be18e576bc9a797853621a20dd7d5245344
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123257
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index a862612a5423..0243ca83961c 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -182,7 +182,7 @@ ifeq ($(ENABLE_LTO),TRUE) ifeq ($(COM_IS_CLANG),TRUE) gb_LTOFLAGS := -flto=thin ifeq (,$(index,iOS MACOSX,$(OS))) -gb_LTOPLUGINFLAGS := --plugin LLVMgold.so +gb_LTOPLUGINFLAGS := --plugin $(if $(LD_PLUGIN),$(LD_PLUGIN),LLVMgold.so) endif else gb_LTOFLAGS := -flto$(if $(filter-out 0,$(PARALLELISM)),=$(PARALLELISM)) -fuse-linker-plugin -O2 diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 686b082a5cf5..829e324a0047 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -144,8 +144,7 @@ endef define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ rm -f $(1) && \ - $(gb_AR) -rsu $(1) \ - $(if $(LD_PLUGIN),--plugin $(LD_PLUGIN)) \ + $(gb_AR) $(gb_LTOPLUGINFLAGS) -rsu $(1) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 4f6315faec68..21ee9458224b 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -161,7 +161,6 @@ define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ rm -f $(1) && \ $(gb_AR) $(gb_LTOPLUGINFLAGS) -rsu $(1) \ - $(if $(LD_PLUGIN),--plugin $(LD_PLUGIN)) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ |