From 79d27b6d6eab82d692c2b3547dacdd4e9190dc1e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 25 Oct 2021 15:54:14 +0100 Subject: bsd (as used by macOS) ar does not support '@' option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit so gb_LinkTarget__command_staticlink should use the same workaround for that as gb_LinkTarget__command_dynamiclink does Change-Id: Ied9d8a3b99f09d6ea1b705e0c1ce3ef3b2d14190 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124156 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- solenv/gbuild/platform/macosx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 50e37cd8df96..5aeb3a95ce86 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -153,7 +153,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach object,$(GENOBJCOBJECTS),$(call gb_GenObjCObject_get_target,$(object))) \ $(foreach object,$(GENOBJCXXOBJECTS),$(call gb_GenObjCxxObject_get_target,$(object))) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ + $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \ $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null)) endef -- cgit