From: Chí-Thanh Christopher Nguyễn Date: Mon, 6 May 2013 18:29:37 +0000 (+0200) Subject: targets/dri-i915: Force c++ linker in all cases X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=121c2c898368ec8de54d230b7db0316695e63a83;p=mesa.git targets/dri-i915: Force c++ linker in all cases NOTE: This is a candidate for the 9.1 branch. Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=461696 Reviewed-by: Andreas Boll --- diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am index f4f9030ebb6..ce6be788f31 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