[Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Sun Apr 17 11:19:54 PDT 2011


 solenv/gbuild/platform/macosx.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0cb149ffb828e95e71e08a79ae1c47f6f5ca8eaf
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Apr 17 13:19:42 2011 -0500

    gcc-4.0 on MacOSX does not support the @file syntax

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 8831f7f..2def0c9 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -270,7 +270,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
 		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
 		-o $(1) \
 		`cat $${DYLIB_FILE}` && \


More information about the Libreoffice-commits mailing list