From 8c92fa385a8be3c76411b539dd0cb26eadaf16d9 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 16 Jun 1999 14:55:28 +0000 Subject: Patcg from Ralf Corsepius : -- configure now fails to detect the toolchain for linux-posix. As work-around, I have reverted to the old behavior of RTEMS_TARGET_CPU_NAME, thus no_cpu/no_bsp will fail badly in configure again. --- tools/cpu/generic/aclocal.m4 | 9 ++------- tools/cpu/generic/configure | 35 +++++++++++++++-------------------- 2 files changed, 17 insertions(+), 27 deletions(-) (limited to 'tools/cpu/generic') diff --git a/tools/cpu/generic/aclocal.m4 b/tools/cpu/generic/aclocal.m4 index 106b026a83..a732cffc8a 100644 --- a/tools/cpu/generic/aclocal.m4 +++ b/tools/cpu/generic/aclocal.m4 @@ -63,15 +63,10 @@ dnl and we have to fix it for rtems ourselves AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU, [ -rtems_target=$target; -case "$target" in -no_cpu*) target=$host;; -*) ;; -esac AC_CANONICAL_SYSTEM AC_MSG_CHECKING(rtems target cpu) changequote(,)dnl -case "${rtems_target}" in +case "${target}" in # hpux unix port should go here i[3456]86-go32-rtems*) RTEMS_CPU=i386 @@ -89,7 +84,7 @@ case "${rtems_target}" in RTEMS_CPU=unix ;; *) - RTEMS_CPU=`echo $rtems_target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` + RTEMS_CPU=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` ;; esac changequote([,])dnl diff --git a/tools/cpu/generic/configure b/tools/cpu/generic/configure index 8bba07f191..3342f81d95 100644 --- a/tools/cpu/generic/configure +++ b/tools/cpu/generic/configure @@ -576,11 +576,6 @@ RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; -rtems_target=$target; -case "$target" in -no_cpu*) target=$host;; -*) ;; -esac # Do some error checking and defaulting for the host and target type. # The inputs are: @@ -609,7 +604,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:613: checking host system type" >&5 +echo "configure:608: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -630,7 +625,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:634: checking target system type" >&5 +echo "configure:629: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -648,7 +643,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:652: checking build system type" >&5 +echo "configure:647: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -671,8 +666,8 @@ test "$host_alias" != "$target_alias" && program_prefix=${target_alias}- echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6 -echo "configure:675: checking rtems target cpu" >&5 -case "${rtems_target}" in +echo "configure:670: checking rtems target cpu" >&5 +case "${target}" in # hpux unix port should go here i[3456]86-go32-rtems*) RTEMS_CPU=i386 @@ -690,7 +685,7 @@ case "${rtems_target}" in RTEMS_CPU=unix ;; *) - RTEMS_CPU=`echo $rtems_target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` + RTEMS_CPU=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` ;; esac @@ -709,7 +704,7 @@ echo "$ac_t""$RTEMS_CPU" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:713: checking for a BSD compatible install" >&5 +echo "configure:708: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -762,7 +757,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:766: checking whether build environment is sane" >&5 +echo "configure:761: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -819,7 +814,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:823: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:818: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -858,7 +853,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:862: checking for working aclocal" >&5 +echo "configure:857: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -871,7 +866,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:875: checking for working autoconf" >&5 +echo "configure:870: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -884,7 +879,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:888: checking for working automake" >&5 +echo "configure:883: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -897,7 +892,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:901: checking for working autoheader" >&5 +echo "configure:896: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -910,7 +905,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:914: checking for working makeinfo" >&5 +echo "configure:909: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -930,7 +925,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:934: checking for $ac_word" >&5 +echo "configure:929: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -- cgit v1.2.3