solenv/gbuild/platform/com_MSC_class.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e8e65884b0add7efce8ed95a673be63d68451a57
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Apr 15 18:35:26 2013 +0200
gbuild: fix WNT build breakage in gb_Library_get_exports_target:
Depending on the library is a total failure because it causes it to be
linked with random junk inherited from other targets.
(regression from 3213cd54b76bc80a6f0516aac75a48ff3b2ad67c)
Change-Id: I1069b870ea0719bc6c01b7f8f3ddf9ff695c9850
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 8b5421f..3f41f1f 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -355,9 +355,10 @@ define gb_Library_get_dllname
$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES)))
endef
-# this is nerfed, it just points to the library to disable the .exports
+# in effect this just causes the .export target to be touched
+# cannot be the .lib itself because that causes attempts to get it linked :(
define gb_Library_get_exports_target
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1)))
+$(call gb_LinkTarget_get_target,$(call
gb_Library_get_linktargetname,$(1))).exports
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
