Mesa (master): configure.ac: rename LLVM_VERSION_PATCH to avoid conflict with llvm-config.h

Marek Olšák mareko at kemper.freedesktop.org
Tue Jun 16 14:07:40 UTC 2015


Module: Mesa
Branch: master
Commit: 797f4eacea8a6b08b7c9143a74c7f2b422d1535d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=797f4eacea8a6b08b7c9143a74c7f2b422d1535d

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Jun  6 13:24:11 2015 +0200

configure.ac: rename LLVM_VERSION_PATCH to avoid conflict with llvm-config.h

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

---

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 34d1ac9..e6d947e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1929,7 +1929,7 @@ if test "x$enable_gallium_llvm" = xyes; then
             LLVM_COMPONENTS="${LLVM_COMPONENTS} all-targets ipo linker instrumentation"
             LLVM_COMPONENTS="${LLVM_COMPONENTS} irreader option objcarcopts profiledata"
         fi
-        DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DLLVM_VERSION_PATCH=$LLVM_VERSION_PATCH"
+        DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DMESA_LLVM_VERSION_PATCH=$LLVM_VERSION_PATCH"
         MESA_LLVM=1
 
         dnl Check for Clang internal headers




More information about the mesa-commit mailing list