diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-08-18 19:26:13 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-08-23 14:58:32 +0200 |
| commit | 61a83cdeac14f6e5b1639e26a31145653d753785 (patch) | |
| tree | 551b3026c8ac8bebbc8d9de1a83d6ab4651e2c06 /solenv | |
| parent | 44ab745e8d702b2ad0e14a023ddb7269dc6c1306 (diff) | |
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.lunak@collabora.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 4 |
1 files changed, 4 insertions, 0 deletions
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 |