Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

revisiting error messages

Browse Source
This commit is contained in:
K. Richard Pixley
1991-08-20 04:56:47 +00:00
parent 5e5215eba7
commit f0b9c97662
3 changed files with 255 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
gdb/configure vendored
View File

@@ -60,6 +60,7 @@ srcdir=
srctrigger=
target=
targets=
commontargets=
targetsubdir=
template=
verbose=
@@ -67,62 +68,62 @@ verbose=
for arg in $*;
do
case ${arg} in
-ansi | +ansi)
-ansi | +a*)
ansi=true
clib=clib
;;
-destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
;;
-forcesubdirs | +forcesubdirs | +forcesubdir | +forcesubdi | +forcesubd \
| +forcesub | +forcesu | +forces | +force | +forc | +for | +fo | +f)
forcesubdirs=${arg}
;;
-languages=* | +languages=* | +language=* | +languag=* \
| +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
| +l=*)
languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
;;
-gas | +gas | +ga | +g)
-gas | +g*)
gas=yes
;;
-help | +h | +help)
-help | +h*)
fatal=true
;;
-nfp | +nfp | +nf | +n)
-nfp | +nf*)
nfp=yes
;;
-norecurse | +norecurse)
-norecurse | +no*)
norecurse=true
;;
-rm | +rm)
-rm | +r*)
removing=${arg}
;;
# -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
# srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
# ;;
-target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=* | +t=*)
-subdirs | +f* | +su*)
subdirs=${arg}
;;
-target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=*)
if [ -n "${targets}" ] ; then
forcesubdirs="+forcesubdirs"
subdirs="+subdirs"
fi
newtargets="${targets} `echo ${arg} | sed 's/[+-]t[a-z]*=//'`"
targets="${newtargets}"
;;
-template=* | +template=*)
-template=* | +template=* | +templat=* | +templa=* | +templ=* | +temp=* | +tem=* | +te=*)
template=`echo ${arg} | sed 's/[+-]template=//'`
;;
+verbose | +verbos | +verbo | +verb | +ver | +ve | +v)
-v | -verbose | +v*)
verbose=${arg}
;;
-* | +*)
(echo ;
echo "Unrecognized option: \"${arg}\"". ;
echo) 1>&2
echo) 2>&1
fatal=true
;;
*)
if [ -n "${hosts}" ] ; then
forcesubdirs="+forcesubdirs"
subdirs="+subdirs"
fi
newhosts="${hosts} ${arg}"
@@ -153,7 +154,7 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
echo "Options: [defaults in brackets]" ;
echo " +ansi configure w/ANSI library. [no ansi lib]" ;
echo " +destdir=MYDIR configure for installation into MYDIR. [/usr/local]" ;
echo " +forcesubdirs configure in subdirectories. [in source directories]" ;
echo " +subdirs configure in subdirectories. [in source directories]" ;
echo " +lang=LANG configure to build LANG. [gcc]" ;
echo " +help print this message. [normal config]" ;
echo " +gas configure the compilers for use with gas. [native as]" ;
@@ -164,8 +165,8 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
echo " +template=TEM rebuild configure using TEM. [normal config]" ;
echo ;
echo "Where HOST and TARGET are something like \"vax\", \"sun3\", \"encore\", etc." ;
echo "Asking for more than one \"+target\" implies \"+forcesubdirs\". Any other" ;
echo "options given will apply to all targets.") 1>&2
echo "Asking for more than one \"+target\" implies \"+subdirs\". Any other" ;
echo "options given will apply to all targets.") 2>&1
if [ -r config.status ] ; then
cat config.status
@@ -183,7 +184,7 @@ srctrigger=main.c
# are we rebuilding config itself?
if [ -n "${template}" ] ; then
if [ ! -r ${template} ] ; then
echo "Can't find template ${template}."
echo '***' "Can't find template ${template}." 2>&1
exit 1
fi
@@ -204,12 +205,12 @@ if [ -n "${template}" ] ; then
if [ -r configure.in ] ; then
if [ -z "`grep '^# per\-host:' configure.in`" ] ; then
echo `pwd`/configure.in has no "per-host:" line.
echo '***' `pwd`/configure.in has no "per-host:" line. 2>&1
exit 1
fi
if [ -z "`grep '^# per\-target:' configure.in`" ] ; then
echo `pwd`/configure.in has no "per-target:" line.
echo '***' `pwd`/configure.in has no "per-target:" line. 2>&1
exit 1
fi
@@ -242,7 +243,10 @@ if [ -n "${template}" ] ; then
rm template.new
# mv configure configure.old
mv configure.new configure
echo Rebuilt configure in `pwd`
if [ -n "${verbose}" ] ; then
echo Rebuilt configure in `pwd`
fi
if [ -z "${norecurse}" ] ; then
# If template is relative path, make it absolute for recursing.
@@ -268,7 +272,7 @@ if [ -n "${template}" ] ; then
(cd $i ;
./configure +template=${template} ${verbose})
else
echo No configure script in `pwd`/$i
echo Warning: No configure script in `pwd`/$i
fi
else
echo Warning: directory $i is missing.
@@ -282,7 +286,7 @@ fi
# some sanity checks on configure.in
if [ -z "${srctrigger}" ] ; then
echo srctrigger not set in configure.in. `pwd` not configured.
echo Warning: srctrigger not set in configure.in. `pwd` not configured.
exit 1
fi
@@ -307,7 +311,6 @@ hostfile=`awk '$1 == "XM_FILE=" { print $2 }' <xconfig/$host`
## end of per-host part.
for target in ${targets} ; do
if [ -n "${verbose}" ] ; then
@@ -358,11 +361,11 @@ fi
targetsubdir=Target-${target}
if [ -n "${removing}" ] ; then
if [ -n "${forcesubdirs}" ] ; then
if [ -n "${subdirs}" ] ; then
if [ -d "${hostsubdir}" ] ; then
rm -rf ${hostsubdir}/${targetsubdir}
if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target-`" ] ; then
if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target- | grep -v Target-independent`" ] ; then
rm -rf ${hostsubdir}
fi
else
@@ -372,24 +375,35 @@ fi
rm -f ${Makefile} config.status ${links}
fi
else
if [ -n "${forcesubdirs}" ] ; then
if [ -n "${subdirs}" ] ; then
# check for existing status before allowing forced subdirs.
if [ -f ${Makefile} ] ; then
echo "${Makefile} already exists in source directory. `pwd` not configured."
echo '***' "${Makefile} already exists in source directory. `pwd` not configured." 2>&1
exit 1
fi
if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
cd ${hostsubdir}
if [ ! -d ${targetsubdir} ] ; then mkdir ${targetsubdir} ; fi
if [ ! -d ${targetsubdir} ] ; then
if [ -z "${commontargets}" ] ; then
mkdir ${targetsubdir}
else
if [ ! -d Target-independent ] ; then
mkdir Target-independent
fi
${symbolic_link} Target-independent ${targetsubdir}
fi # if target independent
fi # if no target dir yet
cd ${targetsubdir}
srcdir=../..
else
# if not subdir builds, then make sure none exist.
if [ -n "`(ls .) 2>&1 | grep Host-`" ] ; then
echo "Configured subdirs exist. `pwd` not configured."
echo '***' "Configured subdirs exist. `pwd` not configured." 2>&1
exit 1
fi
fi
@@ -405,12 +419,12 @@ fi
if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ] ; then
if [ -z "${srcdirdefaulted}" ] ; then
echo "${progname}: Can't find ${srcname} sources in `pwd`/${srcdir}" 1>&2
echo '***' "${progname}: Can't find ${srcname} sources in `pwd`/${srcdir}" 2>&1
else
echo "${progname}: Can't find ${srcname} sources in `pwd`/. or `pwd`/.." 1>&2
echo '***' "${progname}: Can't find ${srcname} sources in `pwd`/. or `pwd`/.." 2>&1
fi
echo \(At least ${srctrigger} is missing.\) 1>&2
echo '***' \(At least ${srctrigger} is missing.\) 2>&1
exit 1
fi
@@ -424,8 +438,8 @@ fi
set ${links}; link=$1; shift; links=$*
if [ ! -r ${srcdir}/${file} ] ; then
echo "${progname}: cannot create a link \"${link}\"," 1>&2
echo "since the file \"${file}\" does not exist." 1>&2
echo '***' "${progname}: cannot create a link \"${link}\"," 2>&1
echo '***' "since the file \"${file}\" does not exist." 2>&1
exit 1
fi
@@ -435,10 +449,13 @@ fi
${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
if [ ! -r ${link} ] ; then
echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
echo '***' "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 2>&1
exit 1
fi
echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
if [ -n "${verbose}" ] ; then
echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
fi
done
# Create a .gdbinit file which runs the one in srcdir
@@ -474,7 +491,7 @@ fi
echo "host = ${host}" >> ${Makefile}
echo "target = ${target}" >> ${Makefile}
if [ -n "${forcesubdirs}" ] ; then
if [ -n "${subdirs}" ] ; then
echo "subdir = /${hostsubdir}/${targetsubdir}" >> ${Makefile}
else
echo "subdir =" >> ${Makefile}
@@ -531,7 +548,9 @@ fi
andusing=${using}
fi
echo "Created \"${Makefile}\"" in `pwd`${andusing}.
if [ -n "${verbose}" ] ; then
echo "Created \"${Makefile}\"" in `pwd`${andusing}.
fi
#### configure.in post-target parts come in here.
@@ -562,7 +581,7 @@ cat ${srcdir}/alldeps.mak ${srcdir}/depend >>Makefile
done # for each target
# Now build a Makefile for this host.
if [ -n "${forcesubdirs}" -a ! -n "${removing}" ] ; then
if [ -n "${subdirs}" -a ! -n "${removing}" ] ; then
cd ${hostsubdir}
cat > GNUmakefile << E!O!F
# Makefile generated by configure for host ${host}.
@@ -584,7 +603,10 @@ if [ -n "${norecurse}" -o -z "${configdirs}" ] ; then exit 0 ; fi
# configdirs is not null
for configdir in ${configdirs} ; do
echo Configuring ${configdir}...
if [ -n "${verbose}" ] ; then
echo Configuring ${configdir}...
fi
specifics=
commons=
@@ -602,7 +624,7 @@ for configdir in ${configdirs} ; do
if [ -n "${commons}" ] ; then
if [ -d ${configdir} ] ; then
(cd ${configdir} ;
./configure ${commons} ${verbose} ${forcesubdirs} ${removing} +destdir=${destdir}) \
./configure ${commons} ${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
| sed 's/^/ /'
else
echo Warning: directory \"${configdir}\" is missing.
@@ -611,9 +633,12 @@ for configdir in ${configdirs} ; do
if [ -n "${specifics}" ] ; then
for host in ${specifics} ; do
echo Configuring target specific directory ${configdir}.${host}...
if [ -n "${verbose} ] ; then
echo Configuring target specific directory ${configdir}.${host}...
fi
(cd ${configdir}.${host} ;
./configure ${host} ${verbose} ${forcesubdirs} ${removing} +destdir=${destdir}) \
./configure ${host} ${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
| sed 's/^/ /'
done # for host in specifics
fi # if there are any specifics
@@ -638,7 +663,7 @@ for configdir in ${configdirs} ; do
if [ -n "${commons}" ] ; then
if [ -d ${configdir} ] ; then
(cd ${configdir} ;
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} \
./configure ${hosts} ${verbose} ${subdirs} ${removing} \
${commons} +destdir=${destdir}) \
| sed 's/^/ /'
else
@@ -648,9 +673,12 @@ for configdir in ${configdirs} ; do
if [ -n "${specifics}" ] ; then
for target in ${specifics} ; do
echo Configuring target specific directory ${configdir}.${target}...
if [ -n "${verbose} ] ; then
echo Configuring target specific directory ${configdir}.${target}...
fi
(cd ${configdir}.${target} ;
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} \
./configure ${hosts} ${verbose} ${subdirs} ${removing} \
"+target=${target}" +destdir=${destdir}) \
| sed 's/^/ /'
done
@@ -662,7 +690,26 @@ exit 0
#
# $Log$
# Revision 1.12 1991/08/06 19:12:51 rich
# Revision 1.16 1991/08/20 04:56:36 rich
# revisiting error messages
#
# Revision 1.28 1991/08/16 19:22:17 rich
# This is the commontargets change and should be considered
# experimental.
#
# Revision 1.27 1991/08/08 01:14:13 rich
# allow +f to stand in for +subdirs
#
# Revision 1.26 1991/08/07 19:21:32 rich
# +forcesubdirs -> +subdirs
#
# Revision 1.25 1991/08/07 07:05:30 rich
# Added make.
#
# Revision 1.24 1991/08/06 19:26:01 rich
# revised option parsing.
#
# Revision 1.23 1991/08/06 19:12:32 rich
# Host-level GNUmakefiles.
#
# Revision 1.22 1991/07/20 01:22:30 rich