<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">2013/5/6 Chí-Thanh Christopher Nguyễn <<a href="mailto:chithanh@gentoo.org" target="_blank">chithanh@gentoo.org</a>> <blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Bugzilla: <a href="https://bugs.gentoo.org/show_bug.cgi?id=461696" target="_blank">https://bugs.gentoo.org/show_bug.cgi?id=461696</a> </blockquote><div> NOTE: This is a candidate for the 9.1 branch. Reviewed-by: Andreas Boll <<a href="mailto:andreas.boll.dev@gmail.com">andreas.boll.dev@gmail.com</a>> </div><blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> --- 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/<a href="http://libllvmpipe.la" target="_blank">libllvmpipe.la</a> $(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 <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>