Merge these:
2003-06-11 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> * configure.in: Don't pass --with-stabs for mips*-sgi-irix6*o32. * configure. Regenerate. 2003-06-10 Nathanael Nerode <neroden@gcc.gnu.org> * configure.in: Disable serial configure by default. * configure: Regenerate. * Makefile.tpl: Abolish .NOTPARALLEL. * Makefile.in: Regenerate.
This commit is contained in:
parent
02112c7344
commit
7f74e6a363
10
ChangeLog
10
ChangeLog
|
@ -3,8 +3,18 @@
|
|||
* config.guess: Update to 2003-06-06 version.
|
||||
* config.sub: Update to 2003-06-06 version.
|
||||
|
||||
2003-06-11 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
|
||||
|
||||
* configure.in: Don't pass --with-stabs for mips*-sgi-irix6*o32.
|
||||
* configure. Regenerate.
|
||||
|
||||
2003-06-10 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
* configure.in: Disable serial configure by default.
|
||||
* configure: Regenerate.
|
||||
* Makefile.tpl: Abolish .NOTPARALLEL.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
* Makefile.tpl: Replace {build,host,target}_canonical by
|
||||
{build,host,target}.
|
||||
* Makefile.in: Regenerate.
|
||||
|
|
10
Makefile.in
10
Makefile.in
|
@ -17293,7 +17293,7 @@ clean-target-libgcc:
|
|||
|
||||
.PHONY: check do-check
|
||||
check:
|
||||
$(MAKE) do-check NOTPARALLEL=parallel-ok
|
||||
$(MAKE) do-check
|
||||
|
||||
# Only include modules actually being configured and built.
|
||||
do-check: maybe-check-gcc \
|
||||
|
@ -23693,7 +23693,7 @@ check-gcc-c++:
|
|||
|
||||
.PHONY: check-c++
|
||||
check-c++:
|
||||
$(MAKE) check-target-libstdc++-v3 check-gcc-c++ NOTPARALLEL=parallel-ok
|
||||
$(MAKE) check-target-libstdc++-v3 check-gcc-c++
|
||||
|
||||
.PHONY: install-gcc maybe-install-gcc
|
||||
maybe-install-gcc:
|
||||
|
@ -23890,12 +23890,6 @@ $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
|
|||
# Special directives to GNU Make
|
||||
# ------------------------------
|
||||
|
||||
# Tell GNU make 3.79 not to run the top level in parallel. This
|
||||
# prevents contention for $builddir/$target/config.cache, as well
|
||||
# as minimizing scatter in file system caches.
|
||||
NOTPARALLEL = .NOTPARALLEL
|
||||
$(NOTPARALLEL):
|
||||
|
||||
# Don't pass command-line variables to submakes.
|
||||
.NOEXPORT:
|
||||
MAKEOVERRIDES=
|
||||
|
|
10
Makefile.tpl
10
Makefile.tpl
|
@ -731,7 +731,7 @@ clean-target-libgcc:
|
|||
|
||||
.PHONY: check do-check
|
||||
check:
|
||||
$(MAKE) do-check NOTPARALLEL=parallel-ok
|
||||
$(MAKE) do-check
|
||||
|
||||
# Only include modules actually being configured and built.
|
||||
do-check: maybe-check-gcc [+
|
||||
|
@ -1298,7 +1298,7 @@ check-gcc-c++:
|
|||
|
||||
.PHONY: check-c++
|
||||
check-c++:
|
||||
$(MAKE) check-target-libstdc++-v3 check-gcc-c++ NOTPARALLEL=parallel-ok
|
||||
$(MAKE) check-target-libstdc++-v3 check-gcc-c++
|
||||
|
||||
.PHONY: install-gcc maybe-install-gcc
|
||||
maybe-install-gcc:
|
||||
|
@ -1495,12 +1495,6 @@ $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
|
|||
# Special directives to GNU Make
|
||||
# ------------------------------
|
||||
|
||||
# Tell GNU make 3.79 not to run the top level in parallel. This
|
||||
# prevents contention for $builddir/$target/config.cache, as well
|
||||
# as minimizing scatter in file system caches.
|
||||
NOTPARALLEL = .NOTPARALLEL
|
||||
$(NOTPARALLEL):
|
||||
|
||||
# Don't pass command-line variables to submakes.
|
||||
.NOEXPORT:
|
||||
MAKEOVERRIDES=
|
||||
|
|
|
@ -12,10 +12,10 @@ ac_help=
|
|||
ac_default_prefix=/usr/local
|
||||
# Any additions from configure.in:
|
||||
ac_help="$ac_help
|
||||
--disable-serial-[{host,target,build}-]configure
|
||||
Don't force sequential configuration of
|
||||
--enable-serial-[{host,target,build}-]configure
|
||||
Force sequential configuration of
|
||||
sub-packages for the host, target or build
|
||||
machine, or of any sub-packages at all"
|
||||
machine, or all sub-packages"
|
||||
ac_help="$ac_help
|
||||
--enable-maintainer-mode enable make rules and dependencies not useful
|
||||
(and sometimes confusing) to the casual installer"
|
||||
|
@ -1916,10 +1916,6 @@ fi
|
|||
# Default to using --with-stabs for certain targets.
|
||||
if test x${with_stabs} = x ; then
|
||||
case "${target}" in
|
||||
mips*-*-irix6*o32)
|
||||
with_stabs=yes;
|
||||
extra_host_args="${extra_host_args} --with-stabs"
|
||||
;;
|
||||
mips*-*-irix6*)
|
||||
;;
|
||||
mips*-*-* | alpha*-*-osf*)
|
||||
|
@ -2390,13 +2386,20 @@ if test "${enable_serial_configure+set}" = set; then
|
|||
fi
|
||||
|
||||
|
||||
case ${enable_serial_configure} in
|
||||
yes)
|
||||
enable_serial_build_configure=yes
|
||||
enable_serial_host_configure=yes
|
||||
enable_serial_target_configure=yes
|
||||
;;
|
||||
esac
|
||||
|
||||
# These force 'configure's to be done one at a time, to avoid problems
|
||||
# with contention over a shared config.cache.
|
||||
rm -f serdep.tmp
|
||||
echo '# serdep.tmp' > serdep.tmp
|
||||
olditem=
|
||||
test "x${enable_serial_configure}" = xno ||
|
||||
test "x${enable_serial_build_configure}" = xno ||
|
||||
test "x${enable_serial_build_configure}" = xyes &&
|
||||
for item in ${build_configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
|
@ -2405,8 +2408,7 @@ for item in ${build_configdirs} ; do
|
|||
olditem=${item}
|
||||
done
|
||||
olditem=
|
||||
test "x${enable_serial_configure}" = xno ||
|
||||
test "x${enable_serial_host_configure}" = xno ||
|
||||
test "x${enable_serial_host_configure}" = xyes &&
|
||||
for item in ${configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
|
@ -2415,8 +2417,7 @@ for item in ${configdirs} ; do
|
|||
olditem=${item}
|
||||
done
|
||||
olditem=
|
||||
test "x${enable_serial_configure}" = xno ||
|
||||
test "x${enable_serial_target_configure}" = xno ||
|
||||
test "x${enable_serial_target_configure}" = xyes &&
|
||||
for item in ${target_configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
|
@ -2692,7 +2693,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
|
|||
# Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2696: checking for $ac_word" >&5
|
||||
echo "configure:2697: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -2725,7 +2726,7 @@ if test -z "$ac_cv_prog_AR" ; then
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2729: checking for $ac_word" >&5
|
||||
echo "configure:2730: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -2764,7 +2765,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2768: checking for $ac_word" >&5
|
||||
echo "configure:2769: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -2797,7 +2798,7 @@ if test -z "$ac_cv_prog_AS" ; then
|
|||
# Extract the first word of "as", so it can be a program name with args.
|
||||
set dummy as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2801: checking for $ac_word" >&5
|
||||
echo "configure:2802: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -2836,7 +2837,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2840: checking for $ac_word" >&5
|
||||
echo "configure:2841: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -2869,7 +2870,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2873: checking for $ac_word" >&5
|
||||
echo "configure:2874: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -2908,7 +2909,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2912: checking for $ac_word" >&5
|
||||
echo "configure:2913: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -2941,7 +2942,7 @@ if test -z "$ac_cv_prog_LD" ; then
|
|||
# Extract the first word of "ld", so it can be a program name with args.
|
||||
set dummy ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2945: checking for $ac_word" >&5
|
||||
echo "configure:2946: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -2980,7 +2981,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2984: checking for $ac_word" >&5
|
||||
echo "configure:2985: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3013,7 +3014,7 @@ if test -z "$ac_cv_prog_NM" ; then
|
|||
# Extract the first word of "nm", so it can be a program name with args.
|
||||
set dummy nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3017: checking for $ac_word" >&5
|
||||
echo "configure:3018: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3052,7 +3053,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3056: checking for $ac_word" >&5
|
||||
echo "configure:3057: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3085,7 +3086,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3089: checking for $ac_word" >&5
|
||||
echo "configure:3090: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3124,7 +3125,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3128: checking for $ac_word" >&5
|
||||
echo "configure:3129: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3157,7 +3158,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then
|
|||
# Extract the first word of "windres", so it can be a program name with args.
|
||||
set dummy windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3161: checking for $ac_word" >&5
|
||||
echo "configure:3162: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3196,7 +3197,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}objcopy; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3200: checking for $ac_word" >&5
|
||||
echo "configure:3201: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3229,7 +3230,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then
|
|||
# Extract the first word of "objcopy", so it can be a program name with args.
|
||||
set dummy objcopy; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3233: checking for $ac_word" >&5
|
||||
echo "configure:3234: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3268,7 +3269,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3272: checking for $ac_word" >&5
|
||||
echo "configure:3273: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3301,7 +3302,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then
|
|||
# Extract the first word of "objdump", so it can be a program name with args.
|
||||
set dummy objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3305: checking for $ac_word" >&5
|
||||
echo "configure:3306: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3349,7 +3350,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3353: checking for $ac_word" >&5
|
||||
echo "configure:3354: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3382,7 +3383,7 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3386: checking for $ac_word" >&5
|
||||
echo "configure:3387: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3421,7 +3422,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3425: checking for $ac_word" >&5
|
||||
echo "configure:3426: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3454,7 +3455,7 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then
|
|||
# Extract the first word of "as", so it can be a program name with args.
|
||||
set dummy as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3458: checking for $ac_word" >&5
|
||||
echo "configure:3459: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3493,7 +3494,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3497: checking for $ac_word" >&5
|
||||
echo "configure:3498: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3526,7 +3527,7 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3530: checking for $ac_word" >&5
|
||||
echo "configure:3531: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3565,7 +3566,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3569: checking for $ac_word" >&5
|
||||
echo "configure:3570: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3598,7 +3599,7 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then
|
|||
# Extract the first word of "ld", so it can be a program name with args.
|
||||
set dummy ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3602: checking for $ac_word" >&5
|
||||
echo "configure:3603: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3637,7 +3638,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3641: checking for $ac_word" >&5
|
||||
echo "configure:3642: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3670,7 +3671,7 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then
|
|||
# Extract the first word of "nm", so it can be a program name with args.
|
||||
set dummy nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3674: checking for $ac_word" >&5
|
||||
echo "configure:3675: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3709,7 +3710,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3713: checking for $ac_word" >&5
|
||||
echo "configure:3714: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3742,7 +3743,7 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3746: checking for $ac_word" >&5
|
||||
echo "configure:3747: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3781,7 +3782,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3785: checking for $ac_word" >&5
|
||||
echo "configure:3786: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3814,7 +3815,7 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then
|
|||
# Extract the first word of "windres", so it can be a program name with args.
|
||||
set dummy windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3818: checking for $ac_word" >&5
|
||||
echo "configure:3819: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -3881,7 +3882,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
|
|||
NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
|
||||
|
||||
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
|
||||
echo "configure:3885: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:3886: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
|
||||
if test "${enable_maintainer_mode+set}" = set; then
|
||||
enableval="$enable_maintainer_mode"
|
||||
|
|
27
configure.in
27
configure.in
|
@ -1230,10 +1230,6 @@ fi
|
|||
# Default to using --with-stabs for certain targets.
|
||||
if test x${with_stabs} = x ; then
|
||||
case "${target}" in
|
||||
mips*-*-irix6*o32)
|
||||
with_stabs=yes;
|
||||
extra_host_args="${extra_host_args} --with-stabs"
|
||||
;;
|
||||
mips*-*-irix6*)
|
||||
;;
|
||||
mips*-*-* | alpha*-*-osf*)
|
||||
|
@ -1698,18 +1694,25 @@ AC_SUBST_FILE(maybe_dependencies)
|
|||
# Create the serialization dependencies. This uses a temporary file.
|
||||
|
||||
AC_ARG_ENABLE([serial-configure],
|
||||
[ --disable-serial-[{host,target,build}-]configure
|
||||
Don't force sequential configuration of
|
||||
[ --enable-serial-[{host,target,build}-]configure
|
||||
Force sequential configuration of
|
||||
sub-packages for the host, target or build
|
||||
machine, or of any sub-packages at all])
|
||||
machine, or all sub-packages])
|
||||
|
||||
case ${enable_serial_configure} in
|
||||
yes)
|
||||
enable_serial_build_configure=yes
|
||||
enable_serial_host_configure=yes
|
||||
enable_serial_target_configure=yes
|
||||
;;
|
||||
esac
|
||||
|
||||
# These force 'configure's to be done one at a time, to avoid problems
|
||||
# with contention over a shared config.cache.
|
||||
rm -f serdep.tmp
|
||||
echo '# serdep.tmp' > serdep.tmp
|
||||
olditem=
|
||||
test "x${enable_serial_configure}" = xno ||
|
||||
test "x${enable_serial_build_configure}" = xno ||
|
||||
test "x${enable_serial_build_configure}" = xyes &&
|
||||
for item in ${build_configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
|
@ -1718,8 +1721,7 @@ for item in ${build_configdirs} ; do
|
|||
olditem=${item}
|
||||
done
|
||||
olditem=
|
||||
test "x${enable_serial_configure}" = xno ||
|
||||
test "x${enable_serial_host_configure}" = xno ||
|
||||
test "x${enable_serial_host_configure}" = xyes &&
|
||||
for item in ${configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
|
@ -1728,8 +1730,7 @@ for item in ${configdirs} ; do
|
|||
olditem=${item}
|
||||
done
|
||||
olditem=
|
||||
test "x${enable_serial_configure}" = xno ||
|
||||
test "x${enable_serial_target_configure}" = xno ||
|
||||
test "x${enable_serial_target_configure}" = xyes &&
|
||||
for item in ${target_configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
|
|
Loading…
Reference in New Issue