summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/dri-swrast
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-03-11 15:24:07 +0000
committerEmil Velikov <[email protected]>2014-03-31 12:26:47 +0100
commit0484b8446a02a4b77d5a1dab89f6e0b8af831027 (patch)
tree044c399c8d86c9e59e138785a2b4a2646064d879 /src/gallium/targets/dri-swrast
parent2d9c33009a62b704e64b49b87ed1cee9c8dcb12b (diff)
gallium/targets: explicitly include a dummy.cpp and remove all the LINK mayhem
Explicitly setting the linker variable was required for old and broken build toolchains. At this point this should no longer be needed, and setting the sources lists will trigger generation of the correct LINK variables. Explicitly include dummy.cpp to use g++ to link the static library which in most cases is based upon C++ code. v2: Reword commit message. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/gallium/targets/dri-swrast')
-rw-r--r--src/gallium/targets/dri-swrast/Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am
index 06eb16aec49..5238459609a 100644
--- a/src/gallium/targets/dri-swrast/Makefile.am
+++ b/src/gallium/targets/dri-swrast/Makefile.am
@@ -36,6 +36,7 @@ AM_CPPFLAGS = \
dridir = $(DRI_DRIVER_INSTALL_DIR)
dri_LTLIBRARIES = swrast_dri.la
+nodist_EXTRA_swrast_dri_la_SOURCES = dummy.cpp
swrast_dri_la_SOURCES = \
swrast_drm_api.c \
$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
@@ -54,8 +55,6 @@ swrast_dri_la_LIBADD = \
$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
$(GALLIUM_DRI_LIB_DEPS)
-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