2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.in: Pass literal subdirectories to AC_CONFIG_SUBDIRS. * configure: Re-generate.
This commit is contained in:
parent
4db6a73d17
commit
d0945c9b3b
@ -1,5 +1,8 @@
|
|||||||
2005-01-07 Andrew Cagney <cagney@gnu.org>
|
2005-01-07 Andrew Cagney <cagney@gnu.org>
|
||||||
|
|
||||||
|
* configure.in: Pass literal subdirectories to AC_CONFIG_SUBDIRS.
|
||||||
|
* configure: Re-generate.
|
||||||
|
|
||||||
* fr30-elf, d30v-elf: Delete directory.
|
* fr30-elf, d30v-elf: Delete directory.
|
||||||
|
|
||||||
2004-11-16 Hans-Peter Nilsson <hp@axis.com>
|
2004-11-16 Hans-Peter Nilsson <hp@axis.com>
|
||||||
|
30
sim/testsuite/configure
vendored
30
sim/testsuite/configure
vendored
@ -644,18 +644,20 @@ test "$host_alias" != "$target_alias" &&
|
|||||||
program_prefix=${target_alias}-
|
program_prefix=${target_alias}-
|
||||||
|
|
||||||
|
|
||||||
# Directories to use in all configurations.
|
# Configure sub-directory for appropriate targets
|
||||||
configdirs=""
|
case ${target} in
|
||||||
|
frv-*-elf )
|
||||||
|
subdirs="frv-elf"
|
||||||
|
|
||||||
# add test sub-directory for appropriate targets
|
;;
|
||||||
testdir=`echo ${target} | sed -e 's/-.*-/-/'`
|
m32r-*-elf )
|
||||||
if test -r ${srcdir}/${testdir}/configure ; then
|
subdirs="frv-elf m32r-elf"
|
||||||
configdirs="${configdirs} $testdir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# add any extra subdirectories
|
;;
|
||||||
case $target in
|
mips64el-*-elf )
|
||||||
*) ;;
|
subdirs="frv-elf m32r-elf mips64el-elf"
|
||||||
|
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Compute the target architecture.
|
# Compute the target architecture.
|
||||||
@ -666,10 +668,6 @@ case $target in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
||||||
# configure the subdirectories too
|
|
||||||
subdirs="$configdirs"
|
|
||||||
|
|
||||||
|
|
||||||
trap '' 1 2 15
|
trap '' 1 2 15
|
||||||
cat > confcache <<\EOF
|
cat > confcache <<\EOF
|
||||||
# This file is a shell script that caches the results of configure
|
# This file is a shell script that caches the results of configure
|
||||||
@ -830,8 +828,8 @@ s%@build_alias@%$build_alias%g
|
|||||||
s%@build_cpu@%$build_cpu%g
|
s%@build_cpu@%$build_cpu%g
|
||||||
s%@build_vendor@%$build_vendor%g
|
s%@build_vendor@%$build_vendor%g
|
||||||
s%@build_os@%$build_os%g
|
s%@build_os@%$build_os%g
|
||||||
s%@arch@%$arch%g
|
|
||||||
s%@subdirs@%$subdirs%g
|
s%@subdirs@%$subdirs%g
|
||||||
|
s%@arch@%$arch%g
|
||||||
|
|
||||||
CEOF
|
CEOF
|
||||||
EOF
|
EOF
|
||||||
@ -964,7 +962,7 @@ if test "$no_recursion" != yes; then
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
for ac_config_dir in $configdirs; do
|
for ac_config_dir in frv-elf m32r-elf mips64el-elf; do
|
||||||
|
|
||||||
# Do not complain, so a configure script can configure whichever
|
# Do not complain, so a configure script can configure whichever
|
||||||
# parts of a large source tree are present.
|
# parts of a large source tree are present.
|
||||||
|
@ -12,18 +12,17 @@ AC_SUBST(CC)
|
|||||||
AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
|
AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
|
||||||
AC_CANONICAL_SYSTEM
|
AC_CANONICAL_SYSTEM
|
||||||
|
|
||||||
# Directories to use in all configurations.
|
# Configure sub-directory for appropriate targets
|
||||||
configdirs=""
|
case ${target} in
|
||||||
|
frv-*-elf )
|
||||||
# add test sub-directory for appropriate targets
|
AC_CONFIG_SUBDIRS(frv-elf)
|
||||||
testdir=`echo ${target} | sed -e 's/-.*-/-/'`
|
;;
|
||||||
if test -r ${srcdir}/${testdir}/configure ; then
|
m32r-*-elf )
|
||||||
configdirs="${configdirs} $testdir"
|
AC_CONFIG_SUBDIRS(m32r-elf)
|
||||||
fi
|
;;
|
||||||
|
mips64el-*-elf )
|
||||||
# add any extra subdirectories
|
AC_CONFIG_SUBDIRS(mips64el-elf)
|
||||||
case $target in
|
;;
|
||||||
*) ;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Compute the target architecture.
|
# Compute the target architecture.
|
||||||
@ -34,7 +33,4 @@ case $target in
|
|||||||
esac
|
esac
|
||||||
AC_SUBST(arch)
|
AC_SUBST(arch)
|
||||||
|
|
||||||
# configure the subdirectories too
|
|
||||||
AC_CONFIG_SUBDIRS($configdirs)
|
|
||||||
|
|
||||||
AC_OUTPUT(Makefile)
|
AC_OUTPUT(Makefile)
|
||||||
|
Loading…
Reference in New Issue
Block a user