[Mesa-dev] [PATCH] targets/dri-i915: Force c++ linker in all cases

[Andreas Boll]

2013/5/6 Chí-Thanh Christopher Nguyễn <chithanh at gentoo.org>

> Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=461696
>

NOTE: This is a candidate for the 9.1 branch.

Reviewed-by: Andreas Boll <andreas.boll.dev at gmail.com>


---
>  src/gallium/targets/dri-i915/Makefile.am | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/src/gallium/targets/dri-i915/Makefile.am
> b/src/gallium/targets/dri-i915/Makefile.am
> index f4f9030..ce6be78 100644
> --- a/src/gallium/targets/dri-i915/Makefile.am
> +++ b/src/gallium/targets/dri-i915/Makefile.am
> @@ -62,17 +62,11 @@ i915_dri_la_LIBADD = \
>         $(GALLIUM_DRI_LIB_DEPS) \
>         $(INTEL_LIBS)
>
> -if HAVE_MESA_LLVM
> -i915_dri_la_LINK = $(CXXLINK) $(i915_dri_la_LDFLAGS)
> -# Mention a dummy pure C++ file to trigger generation of the $(LINK)
> variable
> -nodist_EXTRA_i915_dri_la_SOURCES = dummy-cpp.cpp
> +nodist_EXTRA_i915_dri_la_SOURCES = dummy.cpp
>
> +if HAVE_MESA_LLVM
>  AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
>  i915_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/
> libllvmpipe.la $(LLVM_LIBS)
> -else
> -i915_dri_la_LINK = $(LINK) $(i915_dri_la_LDFLAGS)
> -# Mention a dummy pure C file to trigger generation of the $(LINK)
> variable
> -nodist_EXTRA_i915_dri_la_SOURCES = dummy-c.c
>  endif
>
>  # Provide compatibility with scripts for the old Mesa build system for
> --
> 1.8.1.5
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20130506/d784b476/attachment.html>