diff options
| author | Brian Paul <brianp@vmware.com> | 2013-03-01 16:53:22 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-03-05 14:58:04 -0800 |
| commit | 44a5b5d161db496ec6a9c450a0f369b3356696f2 (patch) | |
| tree | ba5a922dc741e0e68a4027db6bc6c22b3a447953 | |
| parent | f6765c6d20519476d9a52033b65e3a6d109a5115 (diff) | |
svga: always link with C++
Even when we don't have LLVM since there's other C++ code
in the resulting DRI driver object.
Note: This is a candidate for the stable branches.
Reviewed-by: Matt Turner <mattst88@gmail.com>
(cherry picked from commit a99eb5c83fd64d64fee2b6d7f2bb3fea3264ce47)
| -rw-r--r-- | src/gallium/targets/dri-vmwgfx/Makefile.am | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am index 06ebf8872cc..ca7df65ada8 100644 --- a/src/gallium/targets/dri-vmwgfx/Makefile.am +++ b/src/gallium/targets/dri-vmwgfx/Makefile.am @@ -58,17 +58,13 @@ vmwgfx_dri_la_LIBADD = \ $(top_builddir)/src/gallium/drivers/svga/libsvga.la \ $(GALLIUM_DRI_LIB_DEPS) -if HAVE_MESA_LLVM vmwgfx_dri_la_LINK = $(CXXLINK) $(vmwgfx_dri_la_LDFLAGS) # Mention a dummy pure C++ file to trigger generation of the $(LINK) variable nodist_EXTRA_vmwgfx_dri_la_SOURCES = dummy-cpp.cpp +if HAVE_MESA_LLVM vmwgfx_dri_la_LDFLAGS += $(LLVM_LDFLAGS) vmwgfx_dri_la_LIBADD += $(LLVM_LIBS) -else -vmwgfx_dri_la_LINK = $(LINK) $(vmwgfx_dri_la_LDFLAGS) -# Mention a dummy pure C file to trigger generation of the $(LINK) variable -nodist_EXTRA_vmwgfx_dri_la_SOURCES = dummy-c.c endif # Provide compatibility with scripts for the old Mesa build system for |