diff options
| author | Mikhail Glushenkov <foldr@codedgers.com> | 2009-04-21 19:46:10 +0000 |
|---|---|---|
| committer | Mikhail Glushenkov <foldr@codedgers.com> | 2009-04-21 19:46:10 +0000 |
| commit | 4558f481b83a3c14ad5f1077b053a748a3203059 (patch) | |
| tree | 4c57b74b9bbe4de19d3dba798f7a7db187dacaf7 /autoconf | |
| parent | 1d85a1f00bb9554873578d509b0b3aaf1d1d868f (diff) | |
| download | llvm-4558f481b83a3c14ad5f1077b053a748a3203059.tar.gz llvm-4558f481b83a3c14ad5f1077b053a748a3203059.tar.bz2 llvm-4558f481b83a3c14ad5f1077b053a748a3203059.tar.xz | |
Support --with-llvmgccdir and friends in llvmc, take 2.
Should now work when building with objdir != srcdir and when llvm-gcc is not
available.
Thanks to Duncan Sands for testing and advice!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69700 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'autoconf')
| -rw-r--r-- | autoconf/configure.ac | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index a55968956b..9847b44a18 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -472,6 +472,14 @@ AC_ARG_WITH(llvmgxx, LLVMGXX=$with_llvmgxx WITH_LLVMGCCDIR="",) +if test -n "$LLVMGCC"; then + LLVMGCCCOMMAND="$LLVMGCC" +fi + +if test -n "$LLVMGXX"; then + LLVMGXXCOMMAND="$LLVMGXX" +fi + if test -n "$LLVMGCC" && test -z "$LLVMGXX"; then AC_MSG_ERROR([Invalid llvm-g++. Use --with-llvmgxx when --with-llvmgcc is used]); fi @@ -663,22 +671,33 @@ if test "$lt_cv_dlopen_self" = "yes" ; then [Define if dlopen(0) will open the symbols of the program]) fi + if test "$WITH_LLVMGCCDIR" = "default" ; then LLVMGCC="llvm-gcc${EXEEXT}" LLVMGXX="llvm-g++${EXEEXT}" + LLVMGCCCOMMAND="$LLVMGCC" + LLVMGXXCOMMAND="$LLVMGXX" + AC_SUBST(LLVMGCCCOMMAND,$LLVMGCCCOMMAND) + AC_SUBST(LLVMGXXCOMMAND,$LLVMGXXCOMMAND) AC_PATH_PROG(LLVMGCC, $LLVMGCC, []) AC_PATH_PROG(LLVMGXX, $LLVMGXX, []) else if test -z "$LLVMGCC"; then LLVMGCC="$WITH_LLVMGCCDIR/bin/llvm-gcc${EXEEXT}" + LLVMGCCCOMMAND="$LLVMGCC" fi if test -z "$LLVMGXX"; then LLVMGXX="$WITH_LLVMGCCDIR/bin/llvm-g++${EXEEXT}" + LLVMGXXCOMMAND="$LLVMGXX" fi + AC_SUBST(LLVMGCC,$LLVMGCC) AC_SUBST(LLVMGXX,$LLVMGXX) + AC_SUBST(LLVMGCCCOMMAND,$LLVMGCCCOMMAND) + AC_SUBST(LLVMGXXCOMMAND,$LLVMGXXCOMMAND) fi + AC_MSG_CHECKING([tool compatibility]) dnl Ensure that compilation tools are GCC or a GNU compatible compiler such as @@ -1065,6 +1084,9 @@ AC_CONFIG_FILES([llvm.spec]) dnl Configure doxygen's configuration file AC_CONFIG_FILES([docs/doxygen.cfg]) +dnl Configure llvmc's Base plugin +AC_CONFIG_FILES([tools/llvmc/plugins/Base/Base.td]) + dnl Do the first stage of configuration for llvm-config.in. AC_CONFIG_FILES([tools/llvm-config/llvm-config.in]) |