From 61f6cddef72a49d87e2b31ed49cdbc941d3b1efc Mon Sep 17 00:00:00 2001 From: Kusanagi Kouichi Date: Wed, 12 Feb 2014 16:07:55 +0900 Subject: [PATCH] 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: Signed-off-by: Kusanagi Kouichi Reviewed-by: Emil Velikov --- src/gallium/targets/r600/vdpau/Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am index 7f43fbb187f..6e9f1174c9d 100644 --- a/src/gallium/targets/r600/vdpau/Makefile.am +++ b/src/gallium/targets/r600/vdpau/Makefile.am @@ -44,17 +44,13 @@ libvdpau_r600_la_LIBADD = \ $(GALLIUM_DRI_LIB_DEPS) \ $(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 -- 2.30.2