diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-12 08:07:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-12 08:07:49 +0200 |
| commit | f9f3118e6636a03c096898e023e7e13a328cbaed (patch) | |
| tree | 2799648cd825202ce426fc1e55b235a8d9ebbb03 /mesalib/configs | |
| parent | 7a945c825829cbadecebc3723e96a786244b9971 (diff) | |
| parent | 3b47b2c35227184c0eb6dcf6dee8b79c4f9d4474 (diff) | |
| download | vcxsrv-f9f3118e6636a03c096898e023e7e13a328cbaed.tar.gz vcxsrv-f9f3118e6636a03c096898e023e7e13a328cbaed.tar.bz2 vcxsrv-f9f3118e6636a03c096898e023e7e13a328cbaed.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/depthstencil.c
mesalib/src/mesa/main/formats.c
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'mesalib/configs')
| -rw-r--r-- | mesalib/configs/linux-llvm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/configs/linux-llvm b/mesalib/configs/linux-llvm index 54d82b537..ef6c7bb10 100644 --- a/mesalib/configs/linux-llvm +++ b/mesalib/configs/linux-llvm @@ -30,7 +30,7 @@ else endif ifeq ($(MESA_LLVM),1) - LLVM_CFLAGS=`llvm-config --cppflags` + LLVM_CFLAGS=`llvm-config --cppflags|sed 's/-DNDEBUG\>//g'` LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long LLVM_LDFLAGS = $(shell llvm-config --ldflags) LLVM_LIBS = $(shell llvm-config --libs) |