solenv/gbuild/platform/macosx.mk | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 61a83cdeac14f6e5b1639e26a31145653d753785
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Wed Aug 18 19:26:13 2021 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Mon Aug 23 14:58:32 2021 +0200
fix ObjC/C++ generated sources linking on Mac
Change-Id: I4d4a2abdf762e5442d89ce9b6475753e1f43f314
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120802
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a24cefe1080e..50e37cd8df96 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -107,6 +107,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(OBJCXXOBJECTS),$(call
gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(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),$(shell cat
$(extraobjectlist)))) && \
cat $${FILELIST} | tr "[:space:]" "\n" | grep -v '^$$' > $${FILELIST}.1
&& \
mv $${FILELIST}.1 $${FILELIST} && \
@@ -149,6 +151,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(OBJCXXOBJECTS),$(call
gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(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)) \
$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
endef
