diff options
| author | Johannes Obermayr <[email protected]> | 2013-01-11 06:06:33 +0100 |
|---|---|---|
| committer | Andreas Boll <[email protected]> | 2013-01-11 10:20:42 +0100 |
| commit | d98716233e3cc7ed18323a75ac274f70453ed442 (patch) | |
| tree | fdb05146318238263aaf74f368088967df317508 | |
| parent | babab2876080af0fe65249dff559244aebd0b87e (diff) | |
targets/dri-swrast: Force c++ linker in all cases.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=59226
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Andreas Boll <[email protected]>
Tested-by: Vinson Lee <[email protected]>
| -rw-r--r-- | src/gallium/targets/dri-swrast/Makefile.am | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am index 82fcfd294d2..62b592203b7 100644 --- a/src/gallium/targets/dri-swrast/Makefile.am +++ b/src/gallium/targets/dri-swrast/Makefile.am @@ -58,17 +58,11 @@ swrast_dri_la_LIBADD = \ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ $(GALLIUM_DRI_LIB_DEPS) -if HAVE_MESA_LLVM -swrast_dri_la_LINK = $(CXXLINK) $(swrast_dri_la_LDFLAGS) -# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable -nodist_EXTRA_swrast_dri_la_SOURCES = dummy-cpp.cpp +nodist_EXTRA_swrast_dri_la_SOURCES = dummy.cpp +if HAVE_MESA_LLVM AM_CPPFLAGS += -DGALLIUM_LLVMPIPE swrast_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) -else -swrast_dri_la_LINK = $(LINK) $(swrast_dri_la_LDFLAGS) -# Mention a dummy pure C file to trigger generation of the $(LINK) variable -nodist_EXTRA_swrast_dri_la_SOURCES = dummy-c.c endif # Provide compatibility with scripts for the old Mesa build system for |