Mercurial > hg > release > icedtea6-1.10
changeset 2292:be9262040bbc
New configure option --with-llvm-config
2010-10-14 Matthias Klose <doko@ubuntu.com>
* configure.ac: New option --with-llvm-config.
* INSTALL: Document it.
| author | doko@ubuntu.com |
|---|---|
| date | Thu, 14 Oct 2010 13:25:44 +0200 |
| parents | 01c094e27afd |
| children | 519a6f970eba |
| files | ChangeLog INSTALL configure.ac |
| diffstat | 3 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 13 01:31:53 2010 +0100 +++ b/ChangeLog Thu Oct 14 13:25:44 2010 +0200 @@ -1,3 +1,8 @@ +2010-10-14 Matthias Klose <doko@ubuntu.com> + + * configure.ac: New option --with-llvm-config. + * INSTALL: Document it. + 2010-10-13 Andrew John Hughes <ahughes@redhat.com> * NEWS:
--- a/INSTALL Wed Oct 13 01:31:53 2010 +0100 +++ b/INSTALL Thu Oct 14 13:25:44 2010 +0200 @@ -151,6 +151,7 @@ * --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi. * --with-netbeans: Specify the location of NetBeans for VisualVM, defaulting to the netbeans on the path. * --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset. +* --with-llvm-config: Specify the location of the llvm-config binary. Other options may be supplied which enable or disable new features. These are documented fully in the relevant section below.
--- a/configure.ac Wed Oct 13 01:31:53 2010 +0100 +++ b/configure.ac Thu Oct 14 13:25:44 2010 +0200 @@ -395,8 +395,23 @@ AC_SUBST(LIBFFI_CFLAGS) AC_SUBST(LIBFFI_LIBS) +AC_ARG_WITH([llvm-config], + [AS_HELP_STRING([--with-llvm-config], + [llvm-config binary (default is llvm-config)])], + [ + if test "x${withval}" != x; then + if which ${withval} >/dev/null 2>&1 && ${withval} --version >/dev/null 2>&1; then + LLVM_CONFIG=${withval} + else + AC_MSG_ERROR([invalid argument for --with-llvm-config ($withval)]) + fi + fi + ]) + if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then - FIND_TOOL([LLVM_CONFIG], [llvm-config]) + if test "x${LLVM_CONFIG}" = x; then + FIND_TOOL([LLVM_CONFIG], [llvm-config]) + fi llvm_components="jit engine nativecodegen" LLVM_VERSION="`$LLVM_CONFIG --version`" dnl LLVM_CFLAGS