gallium/targets: do not link every driver with libllvmpipe.a

Only some targets need that, the others don't.

diff --git a/configure.ac b/configure.ac
index 851b8d10a5400112934cf516e33c6db752b27e9c..a586f0ae64d6e5b100cbaa52797041c4d9debc58 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1885,7 +1885,7 @@ if test "x$enable_gallium_llvm" = xyes; then
 
        LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
        GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
-       DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"
+       DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS"
        MESA_LLVM=1
     else
        MESA_LLVM=0

diff --git a/src/gallium/targets/Makefile.dri b/src/gallium/targets/Makefile.dri
index 6c6ad184fabefa81d3bc6cbd7f90baab47bc210d..857ebfeac849abfec47ab623449efcd78672739b 100644 (file)
--- a/src/gallium/targets/Makefile.dri
+++ b/src/gallium/targets/Makefile.dri
@@ -2,7 +2,6 @@
 
 
 ifeq ($(MESA_LLVM),1)
-PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 LDFLAGS += $(LLVM_LDFLAGS)
 DRIVER_EXTRAS = $(LLVM_LIBS)
 else

diff --git a/src/gallium/targets/Makefile.xorg b/src/gallium/targets/Makefile.xorg
index 6fad7109f29ed824a7b737b680af9f6d0817149b..025f7426f8597824c2a498c73c0aed3414a45aa8 100644 (file)
--- a/src/gallium/targets/Makefile.xorg
+++ b/src/gallium/targets/Makefile.xorg
@@ -32,7 +32,6 @@ ifeq ($(MESA_LLVM),1)
 LD = $(CXX)
 LDFLAGS += $(LLVM_LDFLAGS)
 USE_CXX=1
-DRIVER_PIPES += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 DRIVER_LINKS += $(LLVM_LIBS) -lm -ldl
 endif
 

diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile
index 9c10d71a4a67b3b3bfa97af560b1a86643b2d816..2ba3eb6e4e62eb1b1ecdb785c8b0010a63a36bb5 100644 (file)
--- a/src/gallium/targets/dri-i915/Makefile
+++ b/src/gallium/targets/dri-i915/Makefile
@@ -22,6 +22,7 @@ DRIVER_DEFINES = \
        -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD -DGALLIUM_SOFTPIPE
 
 ifeq ($(MESA_LLVM),1)
+PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
 endif
 

diff --git a/src/gallium/targets/dri-i965/Makefile b/src/gallium/targets/dri-i965/Makefile
index 4b50d04255f30a3253ddcf9186acbb04973865a0..9e75bfe08314c97394c2a22dc25dd295e793f87d 100644 (file)
--- a/src/gallium/targets/dri-i965/Makefile
+++ b/src/gallium/targets/dri-i965/Makefile
@@ -22,6 +22,7 @@ DRIVER_DEFINES = \
        -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD -DGALLIUM_SOFTPIPE
 
 ifeq ($(MESA_LLVM),1)
+PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
 endif
 

diff --git a/src/gallium/targets/dri-swrast/Makefile b/src/gallium/targets/dri-swrast/Makefile
index 45b933e3f93cb27468e084c22a4acb0e76f019e5..e83e0248b03c291b4fa7a2aefce1c4e3e7af323a 100644 (file)
--- a/src/gallium/targets/dri-swrast/Makefile
+++ b/src/gallium/targets/dri-swrast/Makefile
@@ -14,6 +14,11 @@ PIPE_DRIVERS = \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
        $(TOP)/src/gallium/drivers/rbug/librbug.a
 
+ifeq ($(MESA_LLVM),1)
+PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
+DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
+endif
+
 SWRAST_COMMON_GALLIUM_SOURCES = \
        $(TOP)/src/mesa/drivers/dri/common/utils.c \
        $(TOP)/src/mesa/drivers/dri/common/drisw_util.c \

diff --git a/src/gallium/targets/libgl-xlib/Makefile b/src/gallium/targets/libgl-xlib/Makefile
index 53a6c33ed8214090781ab11ede3f39b5fa784ee6..f8f6c81b3f2fce86389ac6ee38a82f97a0cec065 100644 (file)
--- a/src/gallium/targets/libgl-xlib/Makefile
+++ b/src/gallium/targets/libgl-xlib/Makefile
@@ -55,6 +55,7 @@ LIBS = \
 
 # LLVM
 ifeq ($(MESA_LLVM),1)
+PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 DEFINES += -DGALLIUM_LLVMPIPE
 GL_LIB_DEPS += $(LLVM_LIBS) 
 LDFLAGS += $(LLVM_LDFLAGS)