diff options
| author | Kusanagi Kouichi <slash@ac.auone-net.jp> | 2014-02-12 16:07:55 +0900 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-03-04 13:20:34 -0800 |
| commit | 09a346a1c1d5757815fc6154e1923c154eca08da (patch) | |
| tree | a18835b964edc5abd9ffefb95504b912fe5a4d85 | |
| parent | 5202312160347dab4c8514859ff5c2f9a7bfad79 (diff) | |
targets/vdpau: Always use c++ to link
If built without llvm, the following error occurs with mplayer:
Failed to open VDPAU backend .../libvdpau_r600.so: undefined symbol: _ZTVN10__cxxabiv117__class_type_infoE
[vo/vdpau] Error when calling vdp_device_create_x11: 1
Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit 61f6cddef72a49d87e2b31ed49cdbc941d3b1efc)
| -rw-r--r-- | src/gallium/targets/r600/vdpau/Makefile.am | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am index 7c975859a72..224bfe4e40a 100644 --- a/src/gallium/targets/r600/vdpau/Makefile.am +++ b/src/gallium/targets/r600/vdpau/Makefile.am @@ -58,17 +58,13 @@ libvdpau_r600_la_LIBADD = \ $(LIBDRM_LIBS) \ $(RADEON_LIBS) -if HAVE_MESA_LLVM libvdpau_r600_la_LINK = $(CXXLINK) $(libvdpau_r600_la_LDFLAGS) # Mention a dummy pure C++ file to trigger generation of the $(LINK) variable nodist_EXTRA_libvdpau_r600_la_SOURCES = dummy-cpp.cpp +if HAVE_MESA_LLVM libvdpau_r600_la_LDFLAGS += $(LLVM_LDFLAGS) libvdpau_r600_la_LIBADD += $(LLVM_LIBS) -else -libvdpau_r600_la_LINK = $(LINK) $(libvdpau_r600_la_LDFLAGS) -# Mention a dummy pure C file to trigger generation of the $(LINK) variable -nodist_EXTRA_libvdpau_r600_la_SOURCES = dummy-c.c endif # Provide compatibility with scripts for the old Mesa build system for |