diff options
| author | Chí-Thanh Christopher Nguyễn <[email protected]> | 2013-05-06 20:29:37 +0200 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-05-09 17:04:27 -0700 |
| commit | 121c2c898368ec8de54d230b7db0316695e63a83 (patch) | |
| tree | 3e46556cacf13068bf03edecfde19d2822c413cb | |
| parent | fc98c471150fe7161e57535a125c9d816b891f05 (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/gallium/targets/dri-i915/Makefile.am | 10 |
1 files changed, 2 insertions, 8 deletions
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 |