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 <andreas.boll.dev@gmail.com>
This commit is contained in:
parent
fc98c47115
commit
121c2c8983
|
@ -62,17 +62,11 @@ i915_dri_la_LIBADD = \
|
||||||
$(GALLIUM_DRI_LIB_DEPS) \
|
$(GALLIUM_DRI_LIB_DEPS) \
|
||||||
$(INTEL_LIBS)
|
$(INTEL_LIBS)
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
nodist_EXTRA_i915_dri_la_SOURCES = dummy.cpp
|
||||||
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
|
|
||||||
|
|
||||||
|
if HAVE_MESA_LLVM
|
||||||
AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
|
AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
|
||||||
i915_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
|
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
|
endif
|
||||||
|
|
||||||
# Provide compatibility with scripts for the old Mesa build system for
|
# Provide compatibility with scripts for the old Mesa build system for
|
||||||
|
|
Loading…
Reference in New Issue