Now handles multiple hosts and targets.
This commit is contained in:
parent
0df06ca031
commit
3d6f098360
@ -59,13 +59,14 @@ CCLIBFLAGS = -O
|
|||||||
# Version of ar to use when compiling gnulib.
|
# Version of ar to use when compiling gnulib.
|
||||||
OLDAR = ar
|
OLDAR = ar
|
||||||
|
|
||||||
version=`./gcc -dumpversion`
|
version=`$(srcdir)/../gcc$(subdir)/gcc -dumpversion`
|
||||||
|
|
||||||
# Directory where sources are, from where we are.
|
# Directory where sources are, from where we are.
|
||||||
srcdir = .
|
srcdir = .
|
||||||
# Common prefix for installation directories.
|
# Common prefix for installation directories.
|
||||||
# NOTE: This directory must exist when you start installation.
|
# NOTE: This directory must exist when you start installation.
|
||||||
prefix = /usr/local
|
destdir = /usr/local
|
||||||
|
prefix = $(destdir)
|
||||||
# Directory in which to put the executable for the command `gcc'
|
# Directory in which to put the executable for the command `gcc'
|
||||||
bindir = $(prefix)/bin
|
bindir = $(prefix)/bin
|
||||||
# Directory in which to put the directories used by the compiler.
|
# Directory in which to put the directories used by the compiler.
|
||||||
@ -463,8 +464,8 @@ realclean: cleanconfig
|
|||||||
# Entry points `install', `includes' and `uninstall'.
|
# Entry points `install', `includes' and `uninstall'.
|
||||||
|
|
||||||
# Copy the files into directories where they will be run.
|
# Copy the files into directories where they will be run.
|
||||||
install:
|
install: gas
|
||||||
$(INSTALL_PROGRAM) gas $(bindir)/as
|
$(INSTALL_PROGRAM) gas $(libsubdir)/as
|
||||||
|
|
||||||
# Create the installation directory.
|
# Create the installation directory.
|
||||||
install-dir:
|
install-dir:
|
||||||
@ -595,5 +596,8 @@ force:
|
|||||||
|
|
||||||
Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
|
Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
|
||||||
(cd $(srcdir) ; \
|
(cd $(srcdir) ; \
|
||||||
./configure `if [ "$(srcdir)" != "." ] ; then echo +f; fi` -host=$(host) $(target))
|
./configure +destdir=$(destdir) \
|
||||||
|
+norecurse \
|
||||||
|
`if [ "$(srcdir)" != "." ] ; then echo +f; fi` \
|
||||||
|
$(host) +target=$(target))
|
||||||
|
|
||||||
|
449
gas/configure
vendored
449
gas/configure
vendored
@ -28,17 +28,13 @@ configdirs=
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Shell script to create proper links to machine-dependent files in
|
# Shell script to create proper links to machine-dependent files in
|
||||||
# preparation for compiling gcc.
|
# preparation for compilation.
|
||||||
#
|
|
||||||
# Usage: configure [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET
|
|
||||||
#
|
#
|
||||||
# If configure succeeds, it leaves its status in config.status.
|
# If configure succeeds, it leaves its status in config.status.
|
||||||
# If configure fails after disturbing the status quo,
|
# If configure fails after disturbing the status quo,
|
||||||
# config.status is removed.
|
# config.status is removed.
|
||||||
#
|
#
|
||||||
|
|
||||||
progname=$0
|
|
||||||
|
|
||||||
remove=rm
|
remove=rm
|
||||||
hard_link=ln
|
hard_link=ln
|
||||||
symbolic_link='ln -s'
|
symbolic_link='ln -s'
|
||||||
@ -50,15 +46,19 @@ symbolic_link='ln -s'
|
|||||||
|
|
||||||
# clear some things potentially inherited from environment.
|
# clear some things potentially inherited from environment.
|
||||||
ansi=
|
ansi=
|
||||||
|
defaulttargets=
|
||||||
destdir=
|
destdir=
|
||||||
|
fatal=
|
||||||
hostsubdir=
|
hostsubdir=
|
||||||
norecurse=
|
norecurse=
|
||||||
removing=
|
removing=
|
||||||
srcdir=
|
srcdir=
|
||||||
srctrigger=
|
srctrigger=
|
||||||
target=
|
target=
|
||||||
|
targets=
|
||||||
targetsubdir=
|
targetsubdir=
|
||||||
template=
|
template=
|
||||||
|
verbose=
|
||||||
|
|
||||||
for arg in $*;
|
for arg in $*;
|
||||||
do
|
do
|
||||||
@ -69,12 +69,9 @@ do
|
|||||||
-destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
|
-destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
|
||||||
destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
|
destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
|
||||||
;;
|
;;
|
||||||
-forcesubdirs | +f*)
|
-forcesubdirs | +forcesubdirs | +f)
|
||||||
forcesubdirs=${arg}
|
forcesubdirs=${arg}
|
||||||
;;
|
;;
|
||||||
-host=* | +host=* | +hos=* | +ho=* | +h=*)
|
|
||||||
host=`echo ${arg} | sed 's/[+-]h[a-z]*=//'`
|
|
||||||
;;
|
|
||||||
-languages=* | +languages=* | +language=* | +languag=* \
|
-languages=* | +languages=* | +language=* | +languag=* \
|
||||||
| +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
|
| +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
|
||||||
| +l=*)
|
| +l=*)
|
||||||
@ -83,6 +80,9 @@ do
|
|||||||
-gas | +gas | +ga | +g)
|
-gas | +gas | +ga | +g)
|
||||||
gas=yes
|
gas=yes
|
||||||
;;
|
;;
|
||||||
|
-help | +h | +help)
|
||||||
|
fatal=true
|
||||||
|
;;
|
||||||
-nfp | +nfp | +nf | +n)
|
-nfp | +nfp | +nf | +n)
|
||||||
nfp=yes
|
nfp=yes
|
||||||
;;
|
;;
|
||||||
@ -92,44 +92,84 @@ do
|
|||||||
-rm | +rm)
|
-rm | +rm)
|
||||||
removing=${arg}
|
removing=${arg}
|
||||||
;;
|
;;
|
||||||
-srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
|
# -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
|
||||||
srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
|
# srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
|
||||||
|
# ;;
|
||||||
|
-target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=* | +t=*)
|
||||||
|
if [ -n "${targets}" ] ; then
|
||||||
|
forcesubdirs="+forcesubdirs"
|
||||||
|
fi
|
||||||
|
|
||||||
|
newtargets="${targets} `echo ${arg} | sed 's/[+-]t[a-z]*=//'`"
|
||||||
|
targets="${newtargets}"
|
||||||
;;
|
;;
|
||||||
-template=* | +template=*)
|
-template=* | +template=*)
|
||||||
template=`echo ${arg} | sed 's/[+-]template=//'`
|
template=`echo ${arg} | sed 's/[+-]template=//'`
|
||||||
;;
|
;;
|
||||||
|
+verbose | +verbos | +verbo | +verb | +ver | +ve | +v)
|
||||||
|
verbose=${arg}
|
||||||
|
;;
|
||||||
|
-* | +*)
|
||||||
|
(echo ;
|
||||||
|
echo "Unrecognized option: \"${arg}\"". ;
|
||||||
|
echo) 1>&2
|
||||||
|
fatal=true
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
# Allow configure HOST TARGET
|
if [ -n "${hosts}" ] ; then
|
||||||
if [ -z "${host}" ] ; then host=${target} ; fi
|
forcesubdirs="+forcesubdirs"
|
||||||
target=${arg}
|
fi
|
||||||
|
|
||||||
|
newhosts="${hosts} ${arg}"
|
||||||
|
hosts=${newhosts}
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [ -n "${verbose}" ] ; then
|
||||||
|
echo `pwd`/configure $*
|
||||||
|
echo targets=\"${targets}\"
|
||||||
|
fi
|
||||||
|
|
||||||
# process host and target only if not rebuilding configure itself or removing.
|
# process host and target only if not rebuilding configure itself or removing.
|
||||||
if [ -z "${template}" -a -z "${removing}" ]
|
if [ -z "${template}" -a -z "${removing}" -a -z "${fatal}" ] ; then
|
||||||
then
|
|
||||||
# Complain if an arg is missing
|
# Complain if an arg is missing
|
||||||
if [ -z "${target}" ]
|
if [ -z "${hosts}" ] ; then
|
||||||
then
|
(echo ;
|
||||||
echo "Usage: ${progname} [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET"
|
echo "configure: No HOST specified." ;
|
||||||
echo -n "Where HOST and TARGET are something like "
|
echo) 2>&1
|
||||||
echo "\`vax', \`sun3', \`encore', etc."
|
fatal=true
|
||||||
if [ -r config.status ]
|
fi
|
||||||
then
|
fi
|
||||||
|
|
||||||
|
if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
|
||||||
|
(echo "Usage: configure HOST" ;
|
||||||
|
echo ;
|
||||||
|
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 " +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]" ;
|
||||||
|
echo " +nfp configure the compilers default to soft floating point. [hard float]" ;
|
||||||
|
echo " +norecurse configure this directory only. [recurse]" ;
|
||||||
|
echo " +rm remove this configuration. [build a configuration]" ;
|
||||||
|
echo " +target=TARGET configure for TARGET. [TARGET = HOST]" ;
|
||||||
|
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
|
||||||
|
|
||||||
|
if [ -r config.status ] ; then
|
||||||
cat config.status
|
cat config.status
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
# Default other arg
|
#### configure.in common parts come in here.
|
||||||
if [ -z "${host}" ]
|
|
||||||
then
|
|
||||||
host=${target}
|
|
||||||
fi
|
|
||||||
|
|
||||||
#### configure.in files come in here.
|
|
||||||
# This file is a shell script that supplies the information necessary
|
# This file is a shell script that supplies the information necessary
|
||||||
# to tailor a template configure script into the configure script
|
# to tailor a template configure script into the configure script
|
||||||
# appropriate for this directory. For more information, check any
|
# appropriate for this directory. For more information, check any
|
||||||
@ -138,8 +178,11 @@ fi
|
|||||||
srctrigger=as.c
|
srctrigger=as.c
|
||||||
srcname="gas"
|
srcname="gas"
|
||||||
|
|
||||||
|
# per-host:
|
||||||
|
|
||||||
|
|
||||||
# assign cpu type
|
# assign cpu type
|
||||||
case $target in
|
case ${target} in
|
||||||
sun4* | sparc*)
|
sun4* | sparc*)
|
||||||
cpu_type=sparc
|
cpu_type=sparc
|
||||||
;;
|
;;
|
||||||
@ -161,7 +204,7 @@ a29k*)
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# assign object format
|
# assign object format
|
||||||
case $target in
|
case ${target} in
|
||||||
*-coff)
|
*-coff)
|
||||||
obj_format=coff
|
obj_format=coff
|
||||||
;;
|
;;
|
||||||
@ -177,7 +220,7 @@ generic)
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# assign floating point type
|
# assign floating point type
|
||||||
case $target in
|
case ${target} in
|
||||||
vax)
|
vax)
|
||||||
atof=vax
|
atof=vax
|
||||||
;;
|
;;
|
||||||
@ -192,13 +235,11 @@ files="config/ho-${host}.h config/tc-${cpu_type}.c \
|
|||||||
config/atof-${atof}.c"
|
config/atof-${atof}.c"
|
||||||
|
|
||||||
links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-targ.c"
|
links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-targ.c"
|
||||||
### end of configure.in
|
## end of common part
|
||||||
|
|
||||||
# are we rebuilding config itself?
|
# are we rebuilding config itself?
|
||||||
if [ -n "${template}" ]
|
if [ -n "${template}" ] ; then
|
||||||
then
|
if [ ! -r ${template} ] ; then
|
||||||
if [ ! -r ${template} ]
|
|
||||||
then
|
|
||||||
echo "Can't find template ${template}."
|
echo "Can't find template ${template}."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@ -210,9 +251,25 @@ then
|
|||||||
echo "configdirs=" >> configure
|
echo "configdirs=" >> configure
|
||||||
echo >> configure
|
echo >> configure
|
||||||
|
|
||||||
if [ -r configure.in ]
|
if [ -r configure.in ] ; then
|
||||||
then
|
if [ -z "`grep '^# per\-host:' configure.in`" ] ; then
|
||||||
sed -e "/^####/ r configure.in" ${template} >> configure
|
echo `pwd`/configure.in has no "per-host:" line.
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "`grep '^# per\-target:' configure.in`" ] ; then
|
||||||
|
echo `pwd`/configure.in has no "per-target:" line.
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
sed -e '/^# per\-target:/,$d' configure.in > configure.com
|
||||||
|
sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
|
||||||
|
|
||||||
|
sed -e '/^#### configure.in common parts/ r configure.com' \
|
||||||
|
-e '/^#### / r configure.tgt' \
|
||||||
|
${template} >> configure
|
||||||
|
|
||||||
|
rm -f configure.com configure.tgt configure.hst
|
||||||
else
|
else
|
||||||
echo Warning: no configure.in in `pwd`
|
echo Warning: no configure.in in `pwd`
|
||||||
cat ${template} >> configure
|
cat ${template} >> configure
|
||||||
@ -222,26 +279,21 @@ then
|
|||||||
rm configure.old
|
rm configure.old
|
||||||
echo Rebuilt configure in `pwd`
|
echo Rebuilt configure in `pwd`
|
||||||
|
|
||||||
if [ -z "${norecurse}" ]
|
if [ -z "${norecurse}" ] ; then
|
||||||
then
|
while [ -n "${configdirs}" ] ; do
|
||||||
while [ -n "${configdirs}" ]
|
|
||||||
do
|
|
||||||
# set configdir to car of configdirs, configdirs to cdr of configdirs
|
# set configdir to car of configdirs, configdirs to cdr of configdirs
|
||||||
set ${configdirs}; configdir=$1; shift; configdirs=$*
|
set ${configdirs}; configdir=$1; shift; configdirs=$*
|
||||||
|
|
||||||
if [ "`echo ${configdir}.*`" != "${configdir}.*" ]
|
if [ "`echo ${configdir}.*`" != "${configdir}.*" ] ; then
|
||||||
then
|
|
||||||
targetspecificdirs=${configdir}.*
|
targetspecificdirs=${configdir}.*
|
||||||
else
|
else
|
||||||
targetspecificdirs=
|
targetspecificdirs=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for i in ${configdir} ${targetspecificdirs}
|
for i in ${configdir} ${targetspecificdirs} ; do
|
||||||
do
|
if [ -r $i/configure ] ; then
|
||||||
if [ -r $i/configure ]
|
|
||||||
then
|
|
||||||
(cd $i ;
|
(cd $i ;
|
||||||
configure +template=${template})
|
./configure +template=${template} ${verbose})
|
||||||
else
|
else
|
||||||
echo No configure script in `pwd`/$i
|
echo No configure script in `pwd`/$i
|
||||||
fi
|
fi
|
||||||
@ -253,35 +305,159 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# some sanity checks on configure.in
|
# some sanity checks on configure.in
|
||||||
if [ -z "${srctrigger}" ]
|
if [ -z "${srctrigger}" ] ; then
|
||||||
then
|
|
||||||
echo srctrigger not set in configure.in. `pwd` not configured.
|
echo srctrigger not set in configure.in. `pwd` not configured.
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
for host in ${hosts} ; do
|
||||||
|
# Default other arg
|
||||||
|
if [ -z "${targets}" -o -n "${defaulttargets}" ] ; then
|
||||||
|
targets=${host}
|
||||||
|
defaulttargets=true
|
||||||
|
fi
|
||||||
|
|
||||||
|
#### configure.in per-host parts come in here.
|
||||||
|
|
||||||
|
# assign cpu type
|
||||||
|
case ${target} in
|
||||||
|
sun4* | sparc*)
|
||||||
|
cpu_type=sparc
|
||||||
|
;;
|
||||||
|
sun3*)
|
||||||
|
cpu_type=m68k
|
||||||
|
;;
|
||||||
|
i386*)
|
||||||
|
cpu_type=i386
|
||||||
|
;;
|
||||||
|
i960*)
|
||||||
|
cpu_type=i960
|
||||||
|
;;
|
||||||
|
a29k*)
|
||||||
|
cpu_type=a29k
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
cpu_type=generic
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# assign object format
|
||||||
|
case ${target} in
|
||||||
|
*-coff)
|
||||||
|
obj_format=coff
|
||||||
|
;;
|
||||||
|
*-bout)
|
||||||
|
obj_format=bout
|
||||||
|
;;
|
||||||
|
generic)
|
||||||
|
obj_format=generic
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
obj_format=aout
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# assign floating point type
|
||||||
|
case ${target} in
|
||||||
|
vax)
|
||||||
|
atof=vax
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
atof=ieee
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
files="config/ho-${host}.h config/tc-${cpu_type}.c \
|
||||||
|
config/tc-${cpu_type}.h config/te-generic.h \
|
||||||
|
config/obj-${obj_format}.h config/obj-${obj_format}.c \
|
||||||
|
config/atof-${atof}.c"
|
||||||
|
|
||||||
|
links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-targ.c"
|
||||||
|
## end of per-target part
|
||||||
|
|
||||||
|
|
||||||
|
for target in ${targets} ; do
|
||||||
|
|
||||||
|
if [ -n "${verbose}" ] ; then
|
||||||
|
echo " "target=\"${target}\"
|
||||||
|
fi
|
||||||
|
|
||||||
|
#### configure.in per-target parts come in here.
|
||||||
|
|
||||||
|
# assign cpu type
|
||||||
|
case ${target} in
|
||||||
|
sun4* | sparc*)
|
||||||
|
cpu_type=sparc
|
||||||
|
;;
|
||||||
|
sun3*)
|
||||||
|
cpu_type=m68k
|
||||||
|
;;
|
||||||
|
i386*)
|
||||||
|
cpu_type=i386
|
||||||
|
;;
|
||||||
|
i960*)
|
||||||
|
cpu_type=i960
|
||||||
|
;;
|
||||||
|
a29k*)
|
||||||
|
cpu_type=a29k
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
cpu_type=generic
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# assign object format
|
||||||
|
case ${target} in
|
||||||
|
*-coff)
|
||||||
|
obj_format=coff
|
||||||
|
;;
|
||||||
|
*-bout)
|
||||||
|
obj_format=bout
|
||||||
|
;;
|
||||||
|
generic)
|
||||||
|
obj_format=generic
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
obj_format=aout
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# assign floating point type
|
||||||
|
case ${target} in
|
||||||
|
vax)
|
||||||
|
atof=vax
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
atof=ieee
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
files="config/ho-${host}.h config/tc-${cpu_type}.c \
|
||||||
|
config/tc-${cpu_type}.h config/te-generic.h \
|
||||||
|
config/obj-${obj_format}.h config/obj-${obj_format}.c \
|
||||||
|
config/atof-${atof}.c"
|
||||||
|
|
||||||
|
links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-targ.c"
|
||||||
|
## end of per-target part
|
||||||
|
|
||||||
# Temporarily, we support only direct subdir builds.
|
# Temporarily, we support only direct subdir builds.
|
||||||
hostsubdir=Host-${host}
|
hostsubdir=Host-${host}
|
||||||
targetsubdir=Target-${target}
|
targetsubdir=Target-${target}
|
||||||
|
|
||||||
if [ -n "${removing}" ]
|
if [ -n "${removing}" ] ; then
|
||||||
then
|
if [ -d "${hostsubdir}/${targetsubdir}" ] ; then
|
||||||
if [ -d "${hostsubdir}/${targetsubdir}" ]
|
|
||||||
then
|
|
||||||
rm -rf ${hostsubdir}/${targetsubdir}
|
rm -rf ${hostsubdir}/${targetsubdir}
|
||||||
|
|
||||||
if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target-`" ]
|
if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target-`" ] ; then
|
||||||
then
|
|
||||||
rm -rf ${hostsubdir}
|
rm -rf ${hostsubdir}
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
rm -f .gdbinit Makefile config.status ${links}
|
rm -f Makefile config.status ${links}
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [ -n "${forcesubdirs}" ]
|
if [ -n "${forcesubdirs}" ] ; then
|
||||||
then
|
|
||||||
# check for existing status before allowing forced subdirs.
|
# check for existing status before allowing forced subdirs.
|
||||||
if [ -f Makefile ]
|
if [ -f Makefile ] ; then
|
||||||
then
|
|
||||||
echo "Makefile already exists in source directory. `pwd` not configured."
|
echo "Makefile already exists in source directory. `pwd` not configured."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@ -295,32 +471,28 @@ else
|
|||||||
srcdir=../..
|
srcdir=../..
|
||||||
else
|
else
|
||||||
# if not subdir builds, then make sure none exist.
|
# if not subdir builds, then make sure none exist.
|
||||||
if [ -n "`(ls .) 2>&1 | grep Host-`" ]
|
if [ -n "`(ls .) 2>&1 | grep Host-`" ] ; then
|
||||||
then
|
|
||||||
echo "Configured subdirs exist. `pwd` not configured."
|
echo "Configured subdirs exist. `pwd` not configured."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Find the source files, if location was not specified.
|
# Find the source files, if location was not specified.
|
||||||
if [ -z "${srcdir}" ]
|
if [ -z "${srcdir}" ] ; then
|
||||||
then
|
|
||||||
srcdirdefaulted=1
|
srcdirdefaulted=1
|
||||||
srcdir=.
|
srcdir=.
|
||||||
if [ -n "${srctrigger}" -a ! -r ${srctrigger} ]
|
if [ -n "${srctrigger}" -a ! -r ${srctrigger} ] ; then
|
||||||
then
|
|
||||||
srcdir=..
|
srcdir=..
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ]
|
if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ] ; then
|
||||||
then
|
if [ -z "${srcdirdefaulted}" ] ; then
|
||||||
if [ -z "${srcdirdefaulted}" ]
|
|
||||||
then
|
|
||||||
echo "${progname}: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
|
echo "${progname}: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
|
||||||
else
|
else
|
||||||
echo "${progname}: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
|
echo "${progname}: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -328,14 +500,12 @@ else
|
|||||||
# ${links} is the list of link names, and ${files} is the list of names to link to.
|
# ${links} is the list of link names, and ${files} is the list of names to link to.
|
||||||
|
|
||||||
# Make the links.
|
# Make the links.
|
||||||
while [ -n "${files}" ]
|
while [ -n "${files}" ] ; do
|
||||||
do
|
|
||||||
# set file to car of files, files to cdr of files
|
# set file to car of files, files to cdr of files
|
||||||
set ${files}; file=$1; shift; files=$*
|
set ${files}; file=$1; shift; files=$*
|
||||||
set ${links}; link=$1; shift; links=$*
|
set ${links}; link=$1; shift; links=$*
|
||||||
|
|
||||||
if [ ! -r ${srcdir}/${file} ]
|
if [ ! -r ${srcdir}/${file} ] ; then
|
||||||
then
|
|
||||||
echo "${progname}: cannot create a link \"${link}\"," 1>&2
|
echo "${progname}: cannot create a link \"${link}\"," 1>&2
|
||||||
echo "since the file \"${file}\" does not exist." 1>&2
|
echo "since the file \"${file}\" does not exist." 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
@ -346,8 +516,7 @@ else
|
|||||||
# Make a symlink if possible, otherwise try a hard link
|
# Make a symlink if possible, otherwise try a hard link
|
||||||
${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
|
${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
|
||||||
|
|
||||||
if [ ! -r ${link} ]
|
if [ ! -r ${link} ] ; then
|
||||||
then
|
|
||||||
echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
|
echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@ -376,8 +545,7 @@ else
|
|||||||
# template is stable, these should be optimized. xoxorich.
|
# template is stable, these should be optimized. xoxorich.
|
||||||
|
|
||||||
# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
|
# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
|
||||||
if [ "${host}" != "${target}" ]
|
if [ "${host}" != "${target}" ] ; then
|
||||||
then
|
|
||||||
echo "CROSS=-DCROSS_COMPILE" > Makefile
|
echo "CROSS=-DCROSS_COMPILE" > Makefile
|
||||||
echo "ALL=start.encap" >> Makefile
|
echo "ALL=start.encap" >> Makefile
|
||||||
else
|
else
|
||||||
@ -388,8 +556,7 @@ else
|
|||||||
echo "host = ${host}" >> Makefile
|
echo "host = ${host}" >> Makefile
|
||||||
echo "target = ${target}" >> Makefile
|
echo "target = ${target}" >> Makefile
|
||||||
|
|
||||||
if [ -n "${forcesubdirs}" ]
|
if [ -n "${forcesubdirs}" ] ; then
|
||||||
then
|
|
||||||
echo "subdir = /${hostsubdir}/${targetsubdir}" >> Makefile
|
echo "subdir = /${hostsubdir}/${targetsubdir}" >> Makefile
|
||||||
else
|
else
|
||||||
echo "subdir =" >> Makefile
|
echo "subdir =" >> Makefile
|
||||||
@ -406,15 +573,13 @@ else
|
|||||||
target_var_file=tmake-${target}
|
target_var_file=tmake-${target}
|
||||||
|
|
||||||
# Conditionalize the makefile for this host.
|
# Conditionalize the makefile for this host.
|
||||||
if [ -f ${srcdir}/config/${host_var_file} ]
|
if [ -f ${srcdir}/config/${host_var_file} ] ; then
|
||||||
then
|
|
||||||
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
|
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Conditionalize the makefile for this target.
|
# Conditionalize the makefile for this target.
|
||||||
if [ -f ${srcdir}/config/${target_var_file} ]
|
if [ -f ${srcdir}/config/${target_var_file} ] ; then
|
||||||
then
|
|
||||||
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
|
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
fi
|
fi
|
||||||
@ -424,8 +589,7 @@ else
|
|||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
|
|
||||||
# set destdir
|
# set destdir
|
||||||
if [ -n "${destdir}" ]
|
if [ -n "${destdir}" ] ; then
|
||||||
then
|
|
||||||
sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem
|
sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
fi
|
fi
|
||||||
@ -443,15 +607,12 @@ else
|
|||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
|
|
||||||
using=
|
using=
|
||||||
if [ -f ${srcdir}/config/${host_var_file} ]
|
if [ -f ${srcdir}/config/${host_var_file} ] ; then
|
||||||
then
|
|
||||||
using=" using \"${host_var_file}\""
|
using=" using \"${host_var_file}\""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ${srcdir}/config/${target_var_file} ]
|
if [ -f ${srcdir}/config/${target_var_file} ] ; then
|
||||||
then
|
if [ -z "${using}" ] ; then
|
||||||
if [ -z "${using}" ]
|
|
||||||
then
|
|
||||||
andusing=" using \"${target_var_file}\""
|
andusing=" using \"${target_var_file}\""
|
||||||
else
|
else
|
||||||
andusing="${using} and \"${target_var_file}\""
|
andusing="${using} and \"${target_var_file}\""
|
||||||
@ -460,10 +621,9 @@ else
|
|||||||
andusing=${using}
|
andusing=${using}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Created \"Makefile\""${andusing}.
|
echo "Created \"Makefile\"" in `pwd`${andusing}.
|
||||||
|
|
||||||
if [ "${host}" = "${target}" ]
|
if [ "${host}" = "${target}" ] ; then
|
||||||
then
|
|
||||||
echo "Links are now set up for use with a ${target}." \
|
echo "Links are now set up for use with a ${target}." \
|
||||||
> config.status
|
> config.status
|
||||||
# | tee ${srcdir}/config.status
|
# | tee ${srcdir}/config.status
|
||||||
@ -476,34 +636,90 @@ else
|
|||||||
originaldir=`pwd`
|
originaldir=`pwd`
|
||||||
cd ${srcdir}
|
cd ${srcdir}
|
||||||
fi
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
# If there are subdirectories, then recurse.
|
# If there are subdirectories, then recurse.
|
||||||
|
|
||||||
if [ -n "${norecurse}" ] ; then exit 0 ; fi
|
if [ -n "${norecurse}" -o -z "${configdirs}" ] ; then exit 0 ; fi
|
||||||
|
|
||||||
while [ -n "${configdirs}" ]
|
# configdirs is not null
|
||||||
do
|
for configdir in ${configdirs} ; do
|
||||||
# set configdir to car of configdirs, configdirs to cdr of configdirs
|
echo Configuring ${configdir}...
|
||||||
set ${configdirs}; configdir=$1; shift; configdirs=$*
|
specifics=
|
||||||
|
commons=
|
||||||
|
|
||||||
# check for target override
|
if [ -n "${defaulttargets}" ] ; then
|
||||||
targetspecificdir=${configdir}.${target}
|
for host in ${hosts} ; do
|
||||||
if [ -d ${targetspecificdir} ]
|
if [ -d ${configdir}.${host} ] ; then
|
||||||
then
|
newspecifics="${specifics} ${host}"
|
||||||
configdir=${targetspecificdir}
|
specifics=${newspecifics}
|
||||||
|
else
|
||||||
|
newcommons="${commons} ${host}"
|
||||||
|
commons=${newcommons}
|
||||||
|
fi # if target specific
|
||||||
|
done # for each host
|
||||||
|
|
||||||
|
if [ -n "${commons}" ] ; then
|
||||||
|
(cd ${configdir} ;
|
||||||
|
./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
|
||||||
|
| sed 's/^/ /'
|
||||||
|
fi # if any common hosts
|
||||||
|
|
||||||
|
if [ -n "${specifics}" ] ; then
|
||||||
|
for host in ${specifics} ; do
|
||||||
|
echo Configuring target specific directory ${configdir}.${host}...
|
||||||
|
(cd ${configdir}.${host} ;
|
||||||
|
./configure ${host} ${verbose} ${forcesubdirs} ${removing}) \
|
||||||
|
| sed 's/^/ /'
|
||||||
|
done # for host in specifics
|
||||||
|
fi # if there are any specifics
|
||||||
|
else
|
||||||
|
|
||||||
|
for target in ${targets} ; do
|
||||||
|
if [ -d ${configdir}.${target} ] ; then
|
||||||
|
newspecifics="${specifics} ${target}"
|
||||||
|
specifics=${newspecifics}
|
||||||
|
else
|
||||||
|
newcommons="${commons} +target=${target}"
|
||||||
|
commons=${newcommons}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo Configuring ${configdir}...
|
done # check for target specific dir override
|
||||||
|
|
||||||
|
if [ -n "${verbose}" ] ; then
|
||||||
|
echo " "commons=\"${commons}\"
|
||||||
|
echo " "specifics=\"${specifics}\"
|
||||||
|
fi # if verbose
|
||||||
|
|
||||||
|
if [ -n "${commons}" ] ; then
|
||||||
(cd ${configdir} ;
|
(cd ${configdir} ;
|
||||||
./configure ${forcesubdirs} ${removing} +host=${host} ${target}) \
|
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
|
||||||
| sed 's/^/ /'
|
| sed 's/^/ /'
|
||||||
|
fi # if any commons
|
||||||
|
|
||||||
|
if [ -n "${specifics}" ] ; then
|
||||||
|
for target in ${specifics} ; do
|
||||||
|
echo Configuring target specific directory ${configdir}.${target}...
|
||||||
|
(cd ${configdir}.${target} ;
|
||||||
|
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} "+target=${target}") \
|
||||||
|
| sed 's/^/ /'
|
||||||
|
done
|
||||||
|
fi # if any specifics
|
||||||
|
fi # not default targets
|
||||||
done
|
done
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
#
|
#
|
||||||
# $Log$
|
# $Log$
|
||||||
# Revision 1.4 1991/04/13 02:10:29 rich
|
# Revision 1.6 1991/04/15 23:55:43 rich
|
||||||
|
# Now handles multiple hosts and targets.
|
||||||
|
#
|
||||||
|
# Revision 1.5 1991/04/15 23:43:44 rich
|
||||||
|
# Now handles multiple hosts and targets.
|
||||||
|
#
|
||||||
|
# Revision 1.4 1991/04/13 02:11:03 rich
|
||||||
# Config cut 3. We now almost install a29k.
|
# Config cut 3. We now almost install a29k.
|
||||||
#
|
#
|
||||||
# Revision 1.3 1991/04/11 02:41:54 rich
|
# Revision 1.3 1991/04/11 02:41:54 rich
|
||||||
@ -512,5 +728,10 @@ exit 0
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# Local Variables:
|
||||||
|
# fill-column: 131
|
||||||
|
# End:
|
||||||
|
#
|
||||||
|
|
||||||
# end of configure.template
|
# end of configure.template
|
||||||
|
12
ld/configure
vendored
12
ld/configure
vendored
@ -181,6 +181,7 @@ srcname="linker"
|
|||||||
|
|
||||||
# per-host:
|
# per-host:
|
||||||
|
|
||||||
|
|
||||||
## end of common part
|
## end of common part
|
||||||
|
|
||||||
# are we rebuilding config itself?
|
# are we rebuilding config itself?
|
||||||
@ -212,7 +213,7 @@ if [ -n "${template}" ] ; then
|
|||||||
sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
|
sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
|
||||||
|
|
||||||
sed -e '/^#### configure.in common parts/ r configure.com' \
|
sed -e '/^#### configure.in common parts/ r configure.com' \
|
||||||
-e '/^##### / r configure.tgt' \
|
-e '/^#### / r configure.tgt' \
|
||||||
${template} >> configure
|
${template} >> configure
|
||||||
|
|
||||||
rm -f configure.com configure.tgt configure.hst
|
rm -f configure.com configure.tgt configure.hst
|
||||||
@ -264,6 +265,7 @@ for host in ${hosts} ; do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
#### configure.in per-host parts come in here.
|
#### configure.in per-host parts come in here.
|
||||||
|
|
||||||
## end of per-target part
|
## end of per-target part
|
||||||
|
|
||||||
|
|
||||||
@ -274,6 +276,7 @@ for host in ${hosts} ; do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
#### configure.in per-target parts come in here.
|
#### configure.in per-target parts come in here.
|
||||||
|
|
||||||
## end of per-target part
|
## end of per-target part
|
||||||
|
|
||||||
# Temporarily, we support only direct subdir builds.
|
# Temporarily, we support only direct subdir builds.
|
||||||
@ -549,8 +552,11 @@ exit 0
|
|||||||
|
|
||||||
#
|
#
|
||||||
# $Log$
|
# $Log$
|
||||||
# Revision 1.6 1991/04/15 23:41:04 rich
|
# Revision 1.7 1991/04/15 23:57:22 rich
|
||||||
# Now handles multiple host and targets.
|
# Now handles multiple hosts and targets.
|
||||||
|
#
|
||||||
|
# Revision 1.5 1991/04/15 23:43:44 rich
|
||||||
|
# Now handles multiple hosts and targets.
|
||||||
#
|
#
|
||||||
# Revision 1.4 1991/04/13 02:11:03 rich
|
# Revision 1.4 1991/04/13 02:11:03 rich
|
||||||
# Config cut 3. We now almost install a29k.
|
# Config cut 3. We now almost install a29k.
|
||||||
|
Loading…
Reference in New Issue
Block a user