2009-11-09 Zoltan Varga <vargaz@gmail.com>

	* configure.in: Define LLVM_MAJOR/MINOR_VERSION defines to allow working
	around changes in LLVM APIs.

svn path=/trunk/mono/; revision=145779

diff --git a/ChangeLog b/ChangeLog
index daf924ef4559dab30b017c739c88fd64b6c0ba7a..6c7fafb0a9c5518c67210c0f69dda943dd5d999c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-09  Zoltan Varga  <vargaz@gmail.com>
 
+       * configure.in: Define LLVM_MAJOR/MINOR_VERSION defines to allow working
+       around changes in LLVM APIs.
+       
        * configure.in: Remove the MONO_ARCH_REGPARMS define.
 
        * configure.in (MONO_ARCH_REGPARMS): Set MONO_ARCH_REGPARS on ARM.

diff --git a/configure.in b/configure.in
index e1d85d70f994be594a9dcf4e25d627f3ee499979..05662d6128672cf0128bbdcb5828d9d8522d595f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1867,6 +1867,18 @@ if test "x$enable_llvm" = "xyes"; then
    LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit x86codegen`
    LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++"
 
+   # Should be something like '2.6' or '2.7svn'
+   llvm_version=`$LLVM_CONFIG --version`
+   major_version=`echo $llvm_version | cut -c 1`
+   minor_version=`echo $llvm_version | cut -c 3`
+
+   AC_DEFINE_UNQUOTED(LLVM_MAJOR_VERSION, $major_version, [Major version of LLVM libraries])
+   AC_DEFINE_UNQUOTED(LLVM_MINOR_VERSION, $minor_version, [Minor version of LLVM libraries])
+
+   # Have to pass these on the command line since mini-llvm-cpp.h already includes
+   # llvm's config.h
+   LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MAJOR_VERSION=$major_version -DLLVM_MINOR_VERSION=$minor_version"
+
    AC_SUBST(LLVM_CXXFLAGS)
    AC_SUBST(LLVM_LIBS)
    AC_SUBST(LLVM_LDFLAGS)