[Mesa-dev] [PATCH] svga: always link with C++

[Matt Turner]

On Fri, Mar 1, 2013 at 3:56 PM, Brian Paul <brianp at vmware.com> wrote:
> Even when we don't have LLVM since there's other C++ code
> in the resulting DRI driver object.
> ---
>  src/gallium/targets/dri-vmwgfx/Makefile.am |    6 +-----
>  1 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am
> index 06ebf88..ca7df65 100644
> --- a/src/gallium/targets/dri-vmwgfx/Makefile.am
> +++ b/src/gallium/targets/dri-vmwgfx/Makefile.am
> @@ -58,17 +58,13 @@ vmwgfx_dri_la_LIBADD = \
>         $(top_builddir)/src/gallium/drivers/svga/libsvga.la \
>         $(GALLIUM_DRI_LIB_DEPS)
>
> -if HAVE_MESA_LLVM
>  vmwgfx_dri_la_LINK = $(CXXLINK) $(vmwgfx_dri_la_LDFLAGS)
>  # Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
>  nodist_EXTRA_vmwgfx_dri_la_SOURCES = dummy-cpp.cpp
>
> +if HAVE_MESA_LLVM
>  vmwgfx_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
>  vmwgfx_dri_la_LIBADD += $(LLVM_LIBS)
> -else
> -vmwgfx_dri_la_LINK = $(LINK) $(vmwgfx_dri_la_LDFLAGS)
> -# Mention a dummy pure C file to trigger generation of the $(LINK) variable
> -nodist_EXTRA_vmwgfx_dri_la_SOURCES = dummy-c.c
>  endif
>
>  # Provide compatibility with scripts for the old Mesa build system for
> --
> 1.7.3.4

Reviewed-by: Matt Turner <mattst88 at gmail.com>

Candidate for the stable branch?