diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-10-25 15:54:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-10-25 20:13:32 +0200 |
| commit | 79d27b6d6eab82d692c2b3547dacdd4e9190dc1e (patch) | |
| tree | ddb1af2dfd0cceb9f72b4d8cc1b52bfae9864758 /solenv | |
| parent | 3e9da1e271c26bd17ab4fe107992e6a03fe865de (diff) | |
bsd (as used by macOS) ar does not support '@' option
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 <caolanm@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 |