From 61d1600662722a49b773d88d0be308cf398d2449 Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Fri, 1 Jun 2012 03:24:29 +0000 Subject: [PATCH] configure: Always define AROS_CROSSTOOLSDIR This is needed for contrib Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@44906 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- configure | 18 +++++++++--------- configure.in | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 8434f9e71d..ca898edcd7 100755 --- a/configure +++ b/configure @@ -8327,8 +8327,9 @@ if test "${crosstools}" = "yes"; then if test "${crosstools_guess}" = "no"; then as_fn_error $? "Cannot build external toolchain if an external ELF or AROS toolchain is specified" "$LINENO" 5 fi +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to install the crosstools binaries" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to install the crosstools binaries" >&5 $as_echo_n "checking where to install the crosstools binaries... " >&6; } # Check whether --with-aros-toolchain-install was given. @@ -8336,15 +8337,14 @@ if test "${with_aros_toolchain_install+set}" = set; then : withval=$with_aros_toolchain_install; aros_toolchain_install=$withval fi - if test "x$aros_toolchain_install" = "x"; then - AROS_CROSSTOOLSDIR="$AROS_BUILDDIR_UNIX/bin/$aros_host_arch-$aros_host_cpu/tools/crosstools" - else - AROS_CROSSTOOLSDIR="$aros_toolchain_install" - PATH="$AROS_CROSSTOOLSDIR:$PATH" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AROS_CROSSTOOLSDIR" >&5 -$as_echo "$AROS_CROSSTOOLSDIR" >&6; } +if test "x$aros_toolchain_install" = "x"; then + AROS_CROSSTOOLSDIR="$AROS_BUILDDIR_UNIX/bin/$aros_host_arch-$aros_host_cpu/tools/crosstools" +else + AROS_CROSSTOOLSDIR="$aros_toolchain_install" + PATH="$AROS_CROSSTOOLSDIR:$PATH" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $AROS_CROSSTOOLSDIR" >&5 +$as_echo "$AROS_CROSSTOOLSDIR" >&6; } # Now process extra architecture-specific options. diff --git a/configure.in b/configure.in index 5b4c53717c..52dddc9b7b 100644 --- a/configure.in +++ b/configure.in @@ -1444,17 +1444,17 @@ if test "${crosstools}" = "yes"; then if test "${crosstools_guess}" = "no"; then AC_MSG_ERROR([Cannot build external toolchain if an external ELF or AROS toolchain is specified]) fi +fi - AC_MSG_CHECKING([where to install the crosstools binaries]) - AC_ARG_WITH(aros-toolchain-install,AC_HELP_STRING([--with-aros-toolchain-install=DIR],[Where to install or search for cross tools binaries]),[aros_toolchain_install=$withval]) - if test "x$aros_toolchain_install" = "x"; then - AROS_CROSSTOOLSDIR="$AROS_BUILDDIR_UNIX/bin/$aros_host_arch-$aros_host_cpu/tools/crosstools" - else - AROS_CROSSTOOLSDIR="$aros_toolchain_install" - PATH="$AROS_CROSSTOOLSDIR:$PATH" - fi - AC_MSG_RESULT($AROS_CROSSTOOLSDIR) +AC_MSG_CHECKING([where to install the crosstools binaries]) +AC_ARG_WITH(aros-toolchain-install,AC_HELP_STRING([--with-aros-toolchain-install=DIR],[Where to install or search for cross tools binaries]),[aros_toolchain_install=$withval]) +if test "x$aros_toolchain_install" = "x"; then + AROS_CROSSTOOLSDIR="$AROS_BUILDDIR_UNIX/bin/$aros_host_arch-$aros_host_cpu/tools/crosstools" +else + AROS_CROSSTOOLSDIR="$aros_toolchain_install" + PATH="$AROS_CROSSTOOLSDIR:$PATH" fi +AC_MSG_RESULT($AROS_CROSSTOOLSDIR) # Now process extra architecture-specific options. -- 2.11.4.GIT