diff options
| author | Brian Paul <[email protected]> | 2013-03-01 16:53:22 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-03-01 17:31:32 -0700 |
| commit | a99eb5c83fd64d64fee2b6d7f2bb3fea3264ce47 (patch) | |
| tree | 08a91c67a966d72f560eec3f1000b1661d239e6e /src/gallium | |
| parent | f6c061261885fed0c83c437e9459ba79618f1b3a (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 <[email protected]>
Diffstat (limited to 'src/gallium')
| -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 |