pyuno/Library_pyuno_wrapper.mk | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 8d6cb531d993886c61174cb079cf6316a1a154da
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jul 8 12:16:28 2013 +0200
pyuno: Revert 5589c72b88e502bfca045ae38af16c854afdd401
... which was obsoleted by commit
c007292ec3eedcf2b1ad673308fa42aad31a7333 and apparently causes breakage
for builds with gb_GCOV=YES.
Change-Id: I27def9a8b4d003bf82c84e55d36ace37dd8532b0
(cherry picked from commit 6121703620ed344b181a9f07a7262a664477a209)
diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk
index 66e75fb..4bce8fc 100644
--- a/pyuno/Library_pyuno_wrapper.mk
+++ b/pyuno/Library_pyuno_wrapper.mk
@@ -28,9 +28,10 @@ $(eval $(call gb_Library_use_externals,pyuno_wrapper,\
# libs (loaded though RTLD_GLOBAL libpyuno.so) may resolve that symbol to e.g.
# cppu, because they happen to see that before libstdc++; so the requirement
has
# always been that RTLD_LOCAL-loaded pyuno.so wrapper implicitly load into the
-# process as little as possible:
-$(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib))
-$(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc))
+# process as little as possible.
+# To ensure that pyuno.so does not link against libstdc++ the dynamic link
+# command invokes gcc and not g++ if there are only C objects, so
+# don't add any C++ objects here!
ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
