diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 2 | ||||
| -rw-r--r-- | configs/default | 2 | ||||
| -rw-r--r-- | configs/linux-llvm | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index df52b3f42f6..1f75a9d92cc 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -53,7 +53,7 @@ MKDEP_OPTIONS = @MKDEP_OPTIONS@ INSTALL = @INSTALL@ # Python and flags (generally only needed by the developers) -PYTHON2 = python +PYTHON2 = @PYTHON2@ PYTHON_FLAGS = -t -O -O # Library names (base name) diff --git a/configs/default b/configs/default index 0301345b1fc..3ce90ef981e 100644 --- a/configs/default +++ b/configs/default @@ -9,7 +9,7 @@ CONFIG_NAME = default # Version info MESA_MAJOR=7 -MESA_MINOR=10 +MESA_MINOR=11 MESA_TINY=0 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY) diff --git a/configs/linux-llvm b/configs/linux-llvm index 6aa434032dc..22de0662ee1 100644 --- a/configs/linux-llvm +++ b/configs/linux-llvm @@ -15,7 +15,7 @@ ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86 # override -std=c99 -CFLAGS += -std=gnu99 -D__STDC_CONSTANT_MACROS +CFLAGS += -std=gnu99 LLVM_VERSION := $(shell llvm-config --version) @@ -30,7 +30,7 @@ else endif ifeq ($(MESA_LLVM),1) -# LLVM_CFLAGS=`llvm-config --cflags` + LLVM_CFLAGS=`llvm-config --cppflags` LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long LLVM_LDFLAGS = $(shell llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation) LLVM_LIBS = $(shell llvm-config --libs backend bitwriter bitreader engine ipo interpreter instrumentation) |