bridges/Library_gcc3_macosx_intel.mk | 1 -
solenv/gbuild/platform/macosx.mk | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 36eab7e6cd325d36fdfe579677e6c416d7c90a99
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Sep 22 23:15:35 2012 -0500
gbuild: forgot to include assembler objects in mac links
Change-Id: Ib5168507f251136801a1218a93d4bb6cd4d1845f
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f933f3e..fe3aa96 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -204,6 +204,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(OBJCOBJECTS),$(call
gb_ObjCObject_get_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call
gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
@@ -230,6 +231,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_AR) -rsu $(1) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(OBJCOBJECTS),$(call
gb_ObjCObject_get_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call
gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
commit 44f1f1f556a1020adcf9069dae54cb57cc3739df
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Sep 22 23:15:13 2012 -0500
dl is not a usable library on Mac
Change-Id: I4e34538b1da77c36a41b74484afe050ccedf41e3
diff --git a/bridges/Library_gcc3_macosx_intel.mk
b/bridges/Library_gcc3_macosx_intel.mk
index 46c1587..2dc7dc0 100644
--- a/bridges/Library_gcc3_macosx_intel.mk
+++ b/bridges/Library_gcc3_macosx_intel.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
$(eval $(call gb_Library_use_libraries,gcc3_uno,\
cppu \
- dl \
sal \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
