[vlc-commits] Link vlc-cache-gen with the C++ standard library to avoid issues when we

[Sam Hocevar]

vlc | branch: master | Sam Hocevar <sam at hocevar.net> | Wed Feb 29 20:53:07 2012 +0100| [07d38617832be934896fa7a14fe52f1a65c901ab] | committer: Sam Hocevar

Link vlc-cache-gen with the C++ standard library to avoid issues when we
dlclose() a C++ plugin that was built with a faulty library that may have
registered __cxa_atexit callbacks (usually through the libstdc++ that
library was built with).

Upgrading libstdc++ is not always a solution since some code may have been
inlined and we can't get rid of it.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=07d38617832be934896fa7a14fe52f1a65c901ab
---

 bin/Makefile.am |    2 +-
 bin/dummy.cpp   |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 832d482..40b4f46 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -59,7 +59,7 @@ vlc_win32_rc.rc: $(top_builddir)/config.status vlc_win32_rc.rc.in
 vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
 	$(WINDRES) --include-dir $(top_srcdir)/share/icons -i $< -o $@
 
-vlc_cache_gen_SOURCES = cachegen.c
+vlc_cache_gen_SOURCES = cachegen.c dummy.cpp
 vlc_cache_gen_LDADD = \
 	$(GNUGETOPT_LIBS) \
 	../compat/libcompat.la \
diff --git a/bin/dummy.cpp b/bin/dummy.cpp
new file mode 100644
index 0000000..56a8b38
--- /dev/null
+++ b/bin/dummy.cpp
@@ -0,0 +1 @@
+/* This file is only here to force cachegen to be linked against libstdc++ */