diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-07-08 12:16:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-08 12:18:09 +0200 |
| commit | 6121703620ed344b181a9f07a7262a664477a209 (patch) | |
| tree | 56e66952321a711e78ddd5447595aefa143db3fc /pyuno | |
| parent | f00d4f6dbf393bb41195430b1f54acbbefb85d9c (diff) | |
pyuno: Revert 5589c72b88e502bfca045ae38af16c854afdd401
... which was obsoleted by commit
c007292ec3eedcf2b1ad673308fa42aad31a7333 and apparently causes breakage
for builds with gb_GCOV=YES.
Change-Id: I27def9a8b4d003bf82c84e55d36ace37dd8532b0
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/Library_pyuno_wrapper.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk index 66e75fb87e8e..4bce8fc00b64 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)),) |