summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-08-18 16:28:23 -0600
committerJosé Fonseca <jfonseca@vmware.com>2009-08-29 09:21:35 +0100
commit1ea1cd8468e51a45b1d3c3cac5e4fc6fefa183ba (patch)
tree672b7908c641cd6201bad7211f07ef0926a6ab90 /configs
parent137afe6a550bef675daa00fb3092a521dabe3a3d (diff)
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.
Diffstat (limited to 'configs')
-rw-r--r--configs/linux-llvm17
1 files changed, 12 insertions, 5 deletions
diff --git a/configs/linux-llvm b/configs/linux-llvm
index e7ecd826d5..e7cf791b3f 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=