From c712250a7f452078fe3b8a753421cbf8fd01f868 Mon Sep 17 00:00:00 2001 From: DJ Delorie <dj@redhat.com> Date: Wed, 19 Jun 2002 23:39:41 +0000 Subject: [PATCH] * configure.in: Pull definition of is_cross_compiler earlier. --- ChangeLog | 2 ++ configure.in | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index d90e6cab68..cb89c2b61a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2002-06-19 Nathanael Nerode <neroden@twcny.rr.com> + * configure.in: Pull definition of is_cross_compiler earlier. + * configure.in: Rearrange a little. * configure.in: Remove references to librx. diff --git a/configure.in b/configure.in index 33d1a9c894..e3974bd210 100644 --- a/configure.in +++ b/configure.in @@ -119,6 +119,14 @@ appdirs="" # per-target: +# Define is_cross_compiler to save on calls to 'test'. +is_cross_compiler= +if test x"${host}" = x"${target}" ; then + is_cross_compiler=no +else + is_cross_compiler=yes +fi + # Don't use libstdc++-v3's flags to configure/build itself. libstdcxx_flags='`case $$dir in libstdc++-v3 | libjava) ;; *) test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags --build-includes;; esac` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' @@ -426,19 +434,10 @@ esac # toolchains, we add some directories that should only be useful in a # cross-compiler. -is_cross_compiler= - -if test x"${host}" = x"${target}" ; then - # when doing a native toolchain, don't build the targets - # that are in the 'cross only' list - skipdirs="${skipdirs} ${cross_only}" - is_cross_compiler=no -else - # similarly, don't build the targets in the 'native only' - # list when building a cross compiler - skipdirs="${skipdirs} ${native_only}" - is_cross_compiler=yes -fi +case $is_cross_compiler in + no) skipdirs="${skipdirs} ${cross_only}" ;; + yes) skipdirs="${skipdirs} ${native_only}" ;; +esac # We always want to use the same name for this directory, so that dejagnu # can reliably find it.