diff options
author | Marek Olšák <maraeo@gmail.com> | 2011-06-27 08:25:09 +0200 |
---|---|---|
committer | Marek Olšák <maraeo@gmail.com> | 2011-07-14 03:03:26 +0200 |
commit | 67aba799bc9f32bf60b1587bc7e6072dfadff13d (patch) | |
tree | 434f1c551c3b8d9b94fe61c8a94f9f7b424889f8 /src/gallium/targets | |
parent | 5fe54df58f31e5d321f7cbd5b095eb8c2417deb1 (diff) |
gallium/targets: do not link every driver with libllvmpipe.a
Only some targets need that, the others don't.
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/Makefile.dri | 1 | ||||
-rw-r--r-- | src/gallium/targets/Makefile.xorg | 1 | ||||
-rw-r--r-- | src/gallium/targets/dri-i915/Makefile | 1 | ||||
-rw-r--r-- | src/gallium/targets/dri-i965/Makefile | 1 | ||||
-rw-r--r-- | src/gallium/targets/dri-swrast/Makefile | 5 | ||||
-rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile | 1 |
6 files changed, 8 insertions, 2 deletions
diff --git a/src/gallium/targets/Makefile.dri b/src/gallium/targets/Makefile.dri index 6c6ad184fab..857ebfeac84 100644 --- 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 6fad7109f29..025f7426f85 100644 --- 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 9c10d71a4a6..2ba3eb6e4e6 100644 --- 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 4b50d04255f..9e75bfe0831 100644 --- 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 45b933e3f93..e83e0248b03 100644 --- 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 53a6c33ed82..f8f6c81b3f2 100644 --- 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) |