On Thu, Jan 10, 2013 at 9:06 PM, Johannes Obermayr <[email protected]> wrote: > Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=59226 > --- > src/gallium/targets/dri-swrast/Makefile.am | 10 ++-------- > 1 Datei geändert, 2 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) > > diff --git a/src/gallium/targets/dri-swrast/Makefile.am > b/src/gallium/targets/dri-swrast/Makefile.am > index 82fcfd2..62b5922 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 > -- > 1.7.10.4
Oh cool, same thing I came up with. Any idea why non-LLVM softpipe needs C++ linking? Maybe because of C++ code in libmesagallium.la or something? Reviewed-by: Matt Turner <[email protected]> (I'll commit when vlee confirms this fixes it) _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
