diff options
| author | Tom Stellard <[email protected]> | 2012-04-24 10:34:57 -0400 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2012-06-01 11:28:09 -0400 |
| commit | d416780f396c28be977430e0d2225fa4a95780bc (patch) | |
| tree | b1530fe387b7b55ce90762db3fd7bd2a2649d103 | |
| parent | c79e7668b205492f6e3a7e5d599f6eb6a9bd1eb9 (diff) | |
configure.ac: Add variables LLVM_CPPFLAGS and LLVM_LIBDIR
| -rw-r--r-- | configs/autoconf.in | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 6be977794de..ce02ae6ebc1 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -34,8 +34,10 @@ X11_LIBS = @X11_LIBS@ X11_CFLAGS = @X11_CFLAGS@ LLVM_BINDIR = @LLVM_BINDIR@ LLVM_CFLAGS = @LLVM_CFLAGS@ +LLVM_CPPFLAGS = @LLVM_CPPFLAGS@ LLVM_CXXFLAGS = @LLVM_CXXFLAGS@ LLVM_LDFLAGS = @LLVM_LDFLAGS@ +LLVM_LIBDIR = @LLVM_LIBDIR@ LLVM_LIBS = @LLVM_LIBS@ LLVM_INCLUDEDIR = @LLVM_INCLUDEDIR@ GLW_CFLAGS = @GLW_CFLAGS@ diff --git a/configure.ac b/configure.ac index 7ddd5fad118..07b64830d76 100644 --- a/configure.ac +++ b/configure.ac @@ -1705,7 +1705,9 @@ fi AC_SUBST([LLVM_BINDIR]) AC_SUBST([LLVM_CFLAGS]) +AC_SUBST([LLVM_CPPFLAGS]) AC_SUBST([LLVM_CXXFLAGS]) +AC_SUBST([LLVM_LIBDIR]) AC_SUBST([LLVM_LIBS]) AC_SUBST([LLVM_LDFLAGS]) AC_SUBST([LLVM_INCLUDEDIR]) @@ -1856,7 +1858,9 @@ if test "x$enable_gallium_llvm" = xyes; then LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` LLVM_BINDIR=`$LLVM_CONFIG --bindir` LLVM_CXXFLAGS=`$LLVM_CONFIG --cxxflags` + LLVM_CPPFLAGS=`$LLVM_CONFIG --cppflags` LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` + LLVM_LIBDIR=`$LLVM_CONFIG --libdir` DEFINES="${DEFINES} -DHAVE_LLVM=`echo $LLVM_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/0x0\10\2/g'`" MESA_LLVM=1 else |