]> git.sesse.net Git - vlc/commitdiff
Link vlc-cache-gen with the C++ standard library to avoid issues when we
authorSam Hocevar <sam@hocevar.net>
Wed, 29 Feb 2012 19:53:07 +0000 (20:53 +0100)
committerSam Hocevar <sam@hocevar.net>
Wed, 29 Feb 2012 23:30:00 +0000 (00:30 +0100)
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.

bin/Makefile.am
bin/dummy.cpp [new file with mode: 0644]

index 832d4825c1bb64e817e900bc61b217c2f7a789fc..40b4f46dfde756830abdac0eb9be0b8a5b928bc0 100644 (file)
@@ -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 (file)
index 0000000..56a8b38
--- /dev/null
@@ -0,0 +1 @@
+/* This file is only here to force cachegen to be linked against libstdc++ */