From d2d22780d5c6d95a9ae3f44d9b40a019defba934 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 15 Jun 1999 22:46:44 +0000 Subject: Patch from Ralf Corsepius : > When I run my script that just repeatedly builds different targets, some > of them die with an error like this: > > Making all RTEMS_BSP=gen68360 in cpugmake[5]: Entering directory > `/usr1/rtems/build/build-m68k-rtems/c/src/exec/score/cpu' > Making all RTEMS_BSP=gen68360 in @RTEMS_CPU@ > /bin/sh: @RTEMS_CPU@: No such file or directory > gmake[5]: *** [all] Error 1 > gmake[5]: Leaving directory > `/usr1/rtems/build/build-m68k-rtems/c/src/exec/score/cpu' > > It is not always the same variable substitution that fails. Sometimes it > is @INSTALL@. But reliably, it is a variable substitution that is > failing. > > Do you have any idea why this happens? Yep, I think I know what's going on. AC_SUBST(RTEMS_CPU) is missing in configure.ins, thus @RTEMS_CPU@ in target.cfg.in doesn't get substituted correctly, causing the bug above. Due to the redundancy of RTEMS_CPU, other most BSPs don't seem to be affected. Other similar problems probably exist for the unix/posix bsp and the hppa.1 cpu, because their */tools/*Makefile.ams require RTEMS_CPU, too. --- tools/cpu/sh/Makefile.in | 1 + tools/cpu/sh/aclocal.m4 | 1 + tools/cpu/sh/configure | 44 +++++++++++++++++++++++--------------------- 3 files changed, 25 insertions(+), 21 deletions(-) (limited to 'tools/cpu/sh') diff --git a/tools/cpu/sh/Makefile.in b/tools/cpu/sh/Makefile.in index a7399e7f16..cee00c4a36 100644 --- a/tools/cpu/sh/Makefile.in +++ b/tools/cpu/sh/Makefile.in @@ -70,6 +70,7 @@ CC = @CC@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_CPU = @RTEMS_CPU@ RTEMS_ROOT = @RTEMS_ROOT@ RTEMS_TOPdir = @RTEMS_TOPdir@ VERSION = @VERSION@ diff --git a/tools/cpu/sh/aclocal.m4 b/tools/cpu/sh/aclocal.m4 index 818ad53205..21666f0395 100644 --- a/tools/cpu/sh/aclocal.m4 +++ b/tools/cpu/sh/aclocal.m4 @@ -93,6 +93,7 @@ case "${rtems_target}" in ;; esac changequote([,])dnl +AC_SUBST(RTEMS_CPU) AC_MSG_RESULT($RTEMS_CPU) ]) diff --git a/tools/cpu/sh/configure b/tools/cpu/sh/configure index 565698c137..3a66b60380 100644 --- a/tools/cpu/sh/configure +++ b/tools/cpu/sh/configure @@ -693,6 +693,7 @@ case "${rtems_target}" in RTEMS_CPU=`echo $rtems_target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` ;; esac + echo "$ac_t""$RTEMS_CPU" 1>&6 @@ -708,7 +709,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:712: checking for a BSD compatible install" >&5 +echo "configure:713: 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 @@ -761,7 +762,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:765: checking whether build environment is sane" >&5 +echo "configure:766: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -818,7 +819,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:822: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:823: 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 @@ -857,7 +858,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:861: checking for working aclocal" >&5 +echo "configure:862: 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. @@ -870,7 +871,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:874: checking for working autoconf" >&5 +echo "configure:875: 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. @@ -883,7 +884,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:887: checking for working automake" >&5 +echo "configure:888: 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. @@ -896,7 +897,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:900: checking for working autoheader" >&5 +echo "configure:901: 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. @@ -909,7 +910,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:913: checking for working makeinfo" >&5 +echo "configure:914: 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. @@ -926,7 +927,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:930: checking for $ac_word" >&5 +echo "configure:931: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -956,7 +957,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:960: checking for $ac_word" >&5 +echo "configure:961: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1007,7 +1008,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1011: checking for $ac_word" >&5 +echo "configure:1012: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1039,7 +1040,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1044: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1050,12 +1051,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1054 "configure" +#line 1055 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1081,12 +1082,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1086: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1090: checking whether we are using GNU C" >&5 +echo "configure:1091: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1095,7 +1096,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1114,7 +1115,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1119: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1146,7 +1147,7 @@ else fi echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6 -echo "configure:1150: checking for fabs in -lm" >&5 +echo "configure:1151: checking for fabs in -lm" >&5 ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1154,7 +1155,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1372,6 +1373,7 @@ s%@build_alias@%$build_alias%g s%@build_cpu@%$build_cpu%g s%@build_vendor@%$build_vendor%g s%@build_os@%$build_os%g +s%@RTEMS_CPU@%$RTEMS_CPU%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g -- cgit v1.2.3