diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2014-05-09 04:23:50 -0400 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-05-13 17:33:52 -0700 |
| commit | f3eb3455c889e631ef12823d8fa5814050ef28b3 (patch) | |
| tree | fe3b711d73943a1a96a29066a462281419d15f99 | |
| parent | 9e1eb6fb93e4505219145f92505b21a3b240a53f (diff) | |
configure.ac: Add LLVM_VERSION_PATCH to DEFINES
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
CC: "10.1 10.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit c5d000832579c17fdeff7ec8aaf7430d9b2e1049)
Conflicts:
configure.ac
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 430e6f3309a..e2afb1d0ea4 100644 --- a/configure.ac +++ b/configure.ac @@ -1605,6 +1605,12 @@ if test "x$enable_gallium_llvm" = xyes; then AC_COMPUTE_INT([LLVM_VERSION_MINOR], [LLVM_VERSION_MINOR], [#include "${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h"]) + dnl In LLVM 3.4.1 patch level was defined in config.h and not + dnl llvm-config.h + AC_COMPUTE_INT([LLVM_VERSION_PATCH], [LLVM_VERSION_PATCH], + [#include "${LLVM_INCLUDEDIR}/llvm/Config/config.h"], + LLVM_VERSION_PATCH=0) dnl Default if LLVM_VERSION_PATCH not found + if test "x${LLVM_VERSION_MAJOR}" != x; then LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}" else @@ -1627,7 +1633,7 @@ if test "x$enable_gallium_llvm" = xyes; then LLVM_COMPONENTS="${LLVM_COMPONENTS} option" fi fi - DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT" + DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DLLVM_VERSION_PATCH=$LLVM_VERSION_PATCH" MESA_LLVM=1 dnl Check for Clang internal headers |