Mesa (gallium-llvmpipe): llvmpipe: repurpose linux-llvm config to build the llvmpipe driver

[Brian Paul]

Module: Mesa
Branch: gallium-llvmpipe
Commit: f9041ee5112ad206c7cabf3ecd549ebc6cdc891b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9041ee5112ad206c7cabf3ecd549ebc6cdc891b

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Aug 18 16:28:23 2009 -0600

llvmpipe: repurpose linux-llvm config to build the llvmpipe driver

The gallivm module is no longer built.  If/when gallivm is resuscitated we
can revisit this.

---

 configs/linux-llvm |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/configs/linux-llvm b/configs/linux-llvm
index e7ecd82..e7cf791 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -1,14 +1,21 @@
 # -*-makefile-*-
 # Configuration for Linux and LLVM with debugging info
+# Builds the llvmpipe gallium driver
 
 include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-llvm
 
-GALLIUM_AUXILIARY_DIRS += gallivm
+#GALLIUM_AUXILIARY_DIRS += gallivm
+
+# override for LLVM
+GALLIUM_DRIVERS_DIRS = llvmpipe
 
 OPT_FLAGS = -g -ansi -pedantic
-DEFINES += -DDEBUG -DDEBUG_MATH -DMESA_LLVM=1
+DEFINES += -DDEBUG -DDEBUG_MATH -DGALLIUM_LLVMPIPE
+
+# override -std=c99
+CFLAGS += -std=gnu99
 
 LLVM_VERSION := $(shell llvm-config --version)
 
@@ -17,14 +24,14 @@ ifeq ($(LLVM_VERSION),)
   MESA_LLVM=0
 else
   MESA_LLVM=1
-  $(info Using LLVM version: $(LLVM_VERSION))
+#  $(info Using LLVM version: $(LLVM_VERSION))
 endif
 
 ifeq ($(MESA_LLVM),1)
 #  LLVM_CFLAGS=`llvm-config --cflags`
   LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long
-  LLVM_LDFLAGS=`llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation`
-  LLVM_LIBS=`llvm-config --libs backend bitreader engine ipo interpreter instrumentation`
+  LLVM_LDFLAGS = $(shell llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation)
+  LLVM_LIBS = $(shell llvm-config --libs backend bitreader engine ipo interpreter instrumentation)
   MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=