Mesa (master): libgl-xlib: Fix --enable-gallium-llvm build.
Chia-I Wu
olv at kemper.freedesktop.org
Tue Sep 7 15:55:39 UTC 2010
Module: Mesa
Branch: master
Commit: 28c790ab3118ee4c4171120cba2abf2ae3e84805
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=28c790ab3118ee4c4171120cba2abf2ae3e84805
Author: Chia-I Wu <olv at lunarg.com>
Date: Tue Sep 7 23:45:43 2010 +0800
libgl-xlib: Fix --enable-gallium-llvm build.
Check MESA_LLVM and link to LLVM as other targets do.
---
src/gallium/targets/libgl-xlib/Makefile | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/gallium/targets/libgl-xlib/Makefile b/src/gallium/targets/libgl-xlib/Makefile
index 88cc0cc..79e516a 100644
--- a/src/gallium/targets/libgl-xlib/Makefile
+++ b/src/gallium/targets/libgl-xlib/Makefile
@@ -51,6 +51,14 @@ LIBS = \
$(CELL_SPU_LIB) \
+# LLVM
+ifeq ($(MESA_LLVM),1)
+DEFINES += -DGALLIUM_LLVMPIPE
+GL_LIB_DEPS += $(LLVM_LIBS)
+LDFLAGS += $(LLVM_LDFLAGS)
+endif
+
+
.SUFFIXES : .cpp
.c.o:
@@ -69,7 +77,7 @@ $(TOP)/$(LIB_DIR)/gallium:
# Make the libGL.so library
$(TOP)/$(LIB_DIR)/gallium/$(GL_LIB_NAME): $(XLIB_TARGET_OBJECTS) $(LIBS) Makefile
$(TOP)/bin/mklib -o $(GL_LIB) \
- -linker "$(CXX)" \
+ -linker "$(CXX)" -ldflags '$(LDFLAGS)' \
-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
-cplusplus \
-install $(TOP)/$(LIB_DIR)/gallium \
More information about the mesa-commit
mailing list