diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2009-12-21 21:44:43 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2009-12-21 21:44:43 +0300 |
| commit | 626f6895c9b735c45894f37ae80a3c5618a804dc (patch) | |
| tree | 52e3438bd485d4e05538daa73b90d5a9c195771d /configure.in | |
| parent | baa3d5ff39ee497f6fecd5ecfd61543f38db75ea (diff) | |
In :
2009-12-21 Zoltan Varga <vargaz@gmail.com>
* configure.in: Add an LLVM_CFLAGS automake variable.
In mono/mini:
2009-12-21 Zoltan Varga <vargaz@gmail.com>
* Makefile.am (AM_CFLAGS): Include LLVM_CFLAGS.
* mini-llvm.c: Avoid defining the __STDC_... macros if already defined.
svn path=/trunk/mono/; revision=148816
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.in b/configure.in index c8be62612ad..53755b89988 100644 --- a/configure.in +++ b/configure.in @@ -1909,7 +1909,9 @@ if test "x$enable_llvm" = "xyes"; then AC_MSG_ERROR([llvm-config not found.]) fi - LLVM_CXXFLAGS=`$LLVM_CONFIG --cflags` + # The output of --cflags seems to include optimizations flags too + LLVM_CFLAGS=`$LLVM_CONFIG --cflags | sed -e 's/-O2//g' | sed -e 's/-O0//g' | sed -e 's/-fomit-frame-pointer//g' | sed -e 's/-fPIC//g'` + LLVM_CXXFLAGS=`$LLVM_CONFIG --cxxflags` LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit x86codegen` LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++" @@ -1926,6 +1928,7 @@ if test "x$enable_llvm" = "xyes"; then # llvm's config.h LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MAJOR_VERSION=$major_version -DLLVM_MINOR_VERSION=$minor_version" + AC_SUBST(LLVM_CFLAGS) AC_SUBST(LLVM_CXXFLAGS) AC_SUBST(LLVM_LIBS) AC_SUBST(LLVM_LDFLAGS) |