[llvm-commits] [llvm] r98998 - in /llvm/trunk: autoconf/configure.ac configure
Daniel Dunbar
daniel at zuster.org
Wed Mar 24 11:35:25 PDT 2010
Hi John,
This change is causing configure to emit
configure: WARNING: Unknown project (test-suite) won't be configured
automatically
- Daniel
On Fri, Mar 19, 2010 at 2:31 PM, John Criswell <criswell at uiuc.edu> wrote:
> Author: criswell
> Date: Fri Mar 19 16:31:39 2010
> New Revision: 98998
>
> URL: http://llvm.org/viewvc/llvm-project?rev=98998&view=rev
> Log:
> Force configuration of some projects before others. In particular, some
> projects rely upon llvm-gcc, the LLVM test suite, and poolalloc. This ensures
> that the aforementioned projects have their object trees created first so that
> other projects can find their object trees when they themselves are configured.
>
> Modified:
> llvm/trunk/autoconf/configure.ac
> llvm/trunk/configure
>
> Modified: llvm/trunk/autoconf/configure.ac
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=98998&r1=98997&r2=98998&view=diff
> ==============================================================================
> --- llvm/trunk/autoconf/configure.ac (original)
> +++ llvm/trunk/autoconf/configure.ac Fri Mar 19 16:31:39 2010
> @@ -62,6 +62,41 @@
> dnl just AC_CONFIG_SUBDIRS on the set of directories in projects that have a
> dnl configure script, that usage of the AC_CONFIG_SUBDIRS macro is deprecated.
> dnl Instead we match on the known projects.
> +
> +dnl
> +dnl One tricky part of doing this is that some projects depend upon other
> +dnl projects. For example, several projects rely upon the LLVM test suite.
> +dnl We want to configure those projects first so that their object trees are
> +dnl created before running the configure scripts of projects that depend upon
> +dnl them.
> +dnl
> +
> +dnl Several projects use llvm-gcc, so configure that first
> +if test -d ${srcdir}/projects/llvm-gcc ; then
> + AC_CONFIG_SUBDIRS([projects/llvm-gcc])
> +fi
> +
> +dnl Several projects use the LLVM test suite, so configure it next.
> +if test -d ${srcdir}/projects/test-suite ; then
> + AC_CONFIG_SUBDIRS([projects/test-suite])
> +fi
> +
> +dnl llvm-test is the old name of the test-suite, kept here for backwards
> +dnl compatibility
> +if test -d ${srcdir}/projects/llvm-test ; then
> + AC_CONFIG_SUBDIRS([projects/llvm-test])
> +fi
> +
> +dnl Some projects use poolalloc; configure that next
> +if test -d ${srcdir}/projects/poolalloc ; then
> + AC_CONFIG_SUBDIRS([projects/poolalloc])
> +fi
> +
> +if test -d ${srcdir}/projects/llvm-poolalloc ; then
> + AC_CONFIG_SUBDIRS([projects/llvm-poolalloc])
> +fi
> +
> +dnl Check for all other projects
> for i in `ls ${srcdir}/projects`
> do
> if test -d ${srcdir}/projects/${i} ; then
> @@ -70,16 +105,9 @@
> sample) AC_CONFIG_SUBDIRS([projects/sample]) ;;
> privbracket) AC_CONFIG_SUBDIRS([projects/privbracket]) ;;
> llvm-stacker) AC_CONFIG_SUBDIRS([projects/llvm-stacker]) ;;
> - # llvm-test is the old name of the test-suite, kept here for backwards
> - # compatibility
> - llvm-test) AC_CONFIG_SUBDIRS([projects/llvm-test]) ;;
> - test-suite) AC_CONFIG_SUBDIRS([projects/test-suite]) ;;
> llvm-reopt) AC_CONFIG_SUBDIRS([projects/llvm-reopt]);;
> - llvm-gcc) AC_CONFIG_SUBDIRS([projects/llvm-gcc]) ;;
> llvm-java) AC_CONFIG_SUBDIRS([projects/llvm-java]) ;;
> llvm-tv) AC_CONFIG_SUBDIRS([projects/llvm-tv]) ;;
> - llvm-poolalloc) AC_CONFIG_SUBDIRS([projects/llvm-poolalloc]) ;;
> - poolalloc) AC_CONFIG_SUBDIRS([projects/poolalloc]) ;;
> safecode) AC_CONFIG_SUBDIRS([projects/safecode]) ;;
> llvm-kernel) AC_CONFIG_SUBDIRS([projects/llvm-kernel]) ;;
> *)
>
> Modified: llvm/trunk/configure
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=98998&r1=98997&r2=98998&view=diff
> ==============================================================================
> --- llvm/trunk/configure (original)
> +++ llvm/trunk/configure Fri Mar 19 16:31:39 2010
> @@ -802,17 +802,17 @@
> CXX
> CXXFLAGS
> CCC'
> -ac_subdirs_all='projects/sample
> +ac_subdirs_all='projects/llvm-gcc
> +projects/test-suite
> +projects/llvm-test
> +projects/poolalloc
> +projects/llvm-poolalloc
> +projects/sample
> projects/privbracket
> projects/llvm-stacker
> -projects/llvm-test
> -projects/test-suite
> projects/llvm-reopt
> -projects/llvm-gcc
> projects/llvm-java
> projects/llvm-tv
> -projects/llvm-poolalloc
> -projects/poolalloc
> projects/safecode
> projects/llvm-kernel'
>
> @@ -1951,6 +1951,33 @@
> fi
> fi
>
> +
> +
> +if test -d ${srcdir}/projects/llvm-gcc ; then
> + subdirs="$subdirs projects/llvm-gcc"
> +
> +fi
> +
> +if test -d ${srcdir}/projects/test-suite ; then
> + subdirs="$subdirs projects/test-suite"
> +
> +fi
> +
> +if test -d ${srcdir}/projects/llvm-test ; then
> + subdirs="$subdirs projects/llvm-test"
> +
> +fi
> +
> +if test -d ${srcdir}/projects/poolalloc ; then
> + subdirs="$subdirs projects/poolalloc"
> +
> +fi
> +
> +if test -d ${srcdir}/projects/llvm-poolalloc ; then
> + subdirs="$subdirs projects/llvm-poolalloc"
> +
> +fi
> +
> for i in `ls ${srcdir}/projects`
> do
> if test -d ${srcdir}/projects/${i} ; then
> @@ -1962,24 +1989,12 @@
> ;;
> llvm-stacker) subdirs="$subdirs projects/llvm-stacker"
> ;;
> - # llvm-test is the old name of the test-suite, kept here for backwards
> - # compatibility
> - llvm-test) subdirs="$subdirs projects/llvm-test"
> - ;;
> - test-suite) subdirs="$subdirs projects/test-suite"
> - ;;
> llvm-reopt) subdirs="$subdirs projects/llvm-reopt"
> ;;
> - llvm-gcc) subdirs="$subdirs projects/llvm-gcc"
> - ;;
> llvm-java) subdirs="$subdirs projects/llvm-java"
> ;;
> llvm-tv) subdirs="$subdirs projects/llvm-tv"
> ;;
> - llvm-poolalloc) subdirs="$subdirs projects/llvm-poolalloc"
> - ;;
> - poolalloc) subdirs="$subdirs projects/poolalloc"
> - ;;
> safecode) subdirs="$subdirs projects/safecode"
> ;;
> llvm-kernel) subdirs="$subdirs projects/llvm-kernel"
> @@ -11136,7 +11151,7 @@
> lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
> lt_status=$lt_dlunknown
> cat > conftest.$ac_ext <<EOF
> -#line 11139 "configure"
> +#line 11154 "configure"
> #include "confdefs.h"
>
> #if HAVE_DLFCN_H
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
More information about the llvm-commits
mailing list