[Mesa-dev] [PATCH] targets/vdpau: Always use c++ to link

[Emil Velikov]

On 12/02/14 07:07, Kusanagi Kouichi wrote:
> If built without llvm, the following error occurs with mplayer:
> 
Grrr why are you building r600 without llvm :-P

But seriously this is a nice cleanup that every gallium target can make
use of. Targets that don't do any c++ will handle this as a no-on.

I will commit this and send it to -stable in a week or so, unless
someone beats me to it.

Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

Thanks
-Emil

> 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
> 
> Signed-off-by: Kusanagi Kouichi <slash at ac.auone-net.jp>
> ---
>  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 7f43fbb..6e9f117 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
>