* Makefile.tpl (local-distclean): Don't remove...
(multilib.ts): ... this. Moved into... (multilib.out): ... this. Don't use sub-make. ($(BUILD_SUBDIR)/[+module+]/Makefile, [+module+]/Makefile, $(TARGET_SUBDIR)/[+module+]/Makefile, gcc/Makefile): Moved into... (configure-build-[+module+], configure-[+module+], configure-target-[+module+], configure-gcc): ... these. Test for Makefile existence. Drop config.status from dependencies. * Makefile.in: Rebuilt. * configure.in: Move gcc-version-trigger to the end of ac_configure_args. Add comments to maybedep.tmp and serdep.tmp. Introduce --disable-serial-configure. Remove nonopt from baseargs, matching and removing corresponding whitespace while at it. * configure: Rebuilt.
This commit is contained in:
Alexandre Oliva
parent
5c581ecaf6
commit
af9955fa9c
18
ChangeLog
18
ChangeLog
|
|
@ -1,3 +1,21 @@
|
|||
2002-12-29 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
* Makefile.tpl (local-distclean): Don't remove...
|
||||
(multilib.ts): ... this. Moved into...
|
||||
(multilib.out): ... this. Don't use sub-make.
|
||||
($(BUILD_SUBDIR)/[+module+]/Makefile, [+module+]/Makefile,
|
||||
$(TARGET_SUBDIR)/[+module+]/Makefile, gcc/Makefile): Moved into...
|
||||
(configure-build-[+module+], configure-[+module+],
|
||||
configure-target-[+module+], configure-gcc): ... these. Test
|
||||
for Makefile existence. Drop config.status from dependencies.
|
||||
* Makefile.in: Rebuilt.
|
||||
* configure.in: Move gcc-version-trigger to the end of
|
||||
ac_configure_args. Add comments to maybedep.tmp and
|
||||
serdep.tmp. Introduce --disable-serial-configure. Remove
|
||||
nonopt from baseargs, matching and removing corresponding
|
||||
whitespace while at it.
|
||||
* configure: Rebuilt.
|
||||
|
||||
2002-12-28 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
* configure.in (host_configargs): Replace reference to
|
||||
|
|
|
|||
669
Makefile.in
669
Makefile.in
File diff suppressed because it is too large
Load Diff
42
Makefile.tpl
42
Makefile.tpl
|
|
@ -641,7 +641,7 @@ local-clean:
|
|||
|
||||
local-distclean:
|
||||
-rm -f Makefile config.status config.cache mh-frag mt-frag
|
||||
-rm -f multilib.out multilib.ts multilib.tmp maybedep.tmp serdep.tmp
|
||||
-rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp
|
||||
-if [ "$(TARGET_SUBDIR)" != "." ]; then \
|
||||
rm -rf $(TARGET_SUBDIR); \
|
||||
else true; fi
|
||||
|
|
@ -789,9 +789,10 @@ TAGS: do-TAGS
|
|||
[+ FOR build_modules +]
|
||||
.PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
|
||||
maybe-configure-build-[+module+]:
|
||||
configure-build-[+module+]: $(BUILD_SUBDIR)/[+module+]/Makefile
|
||||
$(BUILD_SUBDIR)/[+module+]/Makefile: config.status
|
||||
@[ -d $(BUILD_SUBDIR)/[+module+] ] || mkdir $(BUILD_SUBDIR)/[+module+];\
|
||||
configure-build-[+module+]:
|
||||
@test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \
|
||||
[ -d $(BUILD_SUBDIR)/[+module+] ] || \
|
||||
mkdir $(BUILD_SUBDIR)/[+module+];\
|
||||
r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
AR="$(AR_FOR_BUILD)"; export AR; \
|
||||
|
|
@ -862,10 +863,9 @@ all-build-[+module+]: configure-build-[+module+]
|
|||
[+ FOR host_modules +]
|
||||
.PHONY: configure-[+module+] maybe-configure-[+module+]
|
||||
maybe-configure-[+module+]:
|
||||
configure-[+module+]: [+module+]/Makefile
|
||||
|
||||
[+module+]/Makefile: config.status
|
||||
@[ -d [+module+] ] || mkdir [+module+]; \
|
||||
configure-[+module+]:
|
||||
@test ! -f [+module+]/Makefile || exit 0; \
|
||||
[ -d [+module+] ] || mkdir [+module+]; \
|
||||
r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
CC="$(CC)"; export CC; \
|
||||
|
|
@ -964,15 +964,18 @@ install-[+module+]: installdirs
|
|||
[+ FOR target_modules +]
|
||||
.PHONY: configure-target-[+module+] maybe-configure-target-[+module+]
|
||||
maybe-configure-target-[+module+]:
|
||||
configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/Makefile
|
||||
|
||||
# There's only one multilib.out. Cleverer subdirs shouldn't need it copied.
|
||||
$(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out
|
||||
@[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\
|
||||
@[ -d $(TARGET_SUBDIR)/[+module+] ] || \
|
||||
mkdir $(TARGET_SUBDIR)/[+module+]; \
|
||||
rm -f $(TARGET_SUBDIR)/[+module+]/Makefile || : ; \
|
||||
cp multilib.out $(TARGET_SUBDIR)/[+module+]/multilib.out
|
||||
|
||||
$(TARGET_SUBDIR)/[+module+]/Makefile: config.status $(TARGET_SUBDIR)/[+module+]/multilib.out
|
||||
@[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\
|
||||
configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out
|
||||
@test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \
|
||||
[ -d $(TARGET_SUBDIR)/[+module+] ] || \
|
||||
mkdir $(TARGET_SUBDIR)/[+module+];\
|
||||
r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
|
|
@ -1092,10 +1095,9 @@ install-target-[+module+]: installdirs
|
|||
# gcc is the only module which uses GCC_FLAGS_TO_PASS.
|
||||
.PHONY: configure-gcc maybe-configure-gcc
|
||||
maybe-configure-gcc:
|
||||
configure-gcc: gcc/Makefile
|
||||
|
||||
gcc/Makefile: config.status
|
||||
@[ -d gcc ] || mkdir gcc; \
|
||||
configure-gcc:
|
||||
@test ! -f gcc/Makefile || exit 0; \
|
||||
[ -d gcc ] || mkdir gcc; \
|
||||
r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
CC="$(CC)"; export CC; \
|
||||
|
|
@ -1395,17 +1397,11 @@ configure-target-qthreads: $(ALL_GCC_C)
|
|||
# work around various timestamp bugs on some systems.
|
||||
# We use move-if-change so that it's only considered updated when it
|
||||
# actually changes, because it has to depend on a phony target.
|
||||
multilib.out: multilib.ts
|
||||
@if [ -f multilib.out ] ; then : else \
|
||||
rm -f multilib.ts; $(MAKE) multilib.ts; \
|
||||
fi
|
||||
|
||||
multilib.ts: maybe-all-gcc
|
||||
multilib.out: maybe-all-gcc
|
||||
@r=`${PWD}`; export r; \
|
||||
echo "Checking multilib configuration..."; \
|
||||
$(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
|
||||
$(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
|
||||
echo timestamp > multilib.ts
|
||||
|
||||
# Rebuilding Makefile.in, using autogen.
|
||||
AUTOGEN = autogen
|
||||
|
|
|
|||
|
|
@ -11,6 +11,11 @@
|
|||
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
|
||||
sub-packages for the host, target or build
|
||||
machine, or of any sub-packages at all"
|
||||
|
||||
# Initialize some variables set by options.
|
||||
# The variables have the same names as the options, with
|
||||
|
|
@ -568,7 +573,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
|
|||
fi
|
||||
|
||||
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
||||
echo "configure:572: checking host system type" >&5
|
||||
echo "configure:577: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
|
|
@ -589,7 +594,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
echo "$ac_t""$host" 1>&6
|
||||
|
||||
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
||||
echo "configure:593: checking target system type" >&5
|
||||
echo "configure:598: checking target system type" >&5
|
||||
|
||||
target_alias=$target
|
||||
case "$target_alias" in
|
||||
|
|
@ -607,7 +612,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
echo "$ac_t""$target" 1>&6
|
||||
|
||||
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
||||
echo "configure:611: checking build system type" >&5
|
||||
echo "configure:616: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
|
|
@ -764,7 +769,7 @@ else
|
|||
;;
|
||||
* )
|
||||
# Add to all subconfigure arguments: build, host, and target.
|
||||
ac_configure_args="--with-gcc-version-trigger=$gcc_version_trigger $ac_configure_args"
|
||||
ac_configure_args="$ac_configure_args --with-gcc-version-trigger=$gcc_version_trigger"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
@ -2338,6 +2343,7 @@ esac
|
|||
|
||||
# Create the 'maybe dependencies'. This uses a temporary file.
|
||||
rm -f maybedep.tmp
|
||||
echo '# maybedep.tmp' > maybedep.tmp
|
||||
for item in ${all_build_modules} ${all_host_modules} ${all_target_modules} \
|
||||
${install_host_modules} ${install_target_modules} \
|
||||
${configure_build_modules} ${configure_host_modules} ${configure_target_modules} \
|
||||
|
|
@ -2349,45 +2355,62 @@ maybe_dependencies=maybedep.tmp
|
|||
|
||||
# Create the serialization dependencies. This uses a temporary file.
|
||||
|
||||
# Check whether --enable-serial-configure or --disable-serial-configure was given.
|
||||
if test "${enable_serial_configure+set}" = set; then
|
||||
enableval="$enable_serial_configure"
|
||||
:
|
||||
fi
|
||||
|
||||
|
||||
# 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 ||
|
||||
for item in ${build_configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
*) echo "\$(BUILD_SUBDIR)/${item}/Makefile: \$(BUILD_SUBDIR)/${olditem}/Makefile" >> serdep.tmp ;;
|
||||
*) echo "configure-build-${item}: configure-build-${olditem}" >> serdep.tmp ;;
|
||||
esac
|
||||
olditem=${item}
|
||||
done
|
||||
olditem=
|
||||
test "x${enable_serial_configure}" = xno ||
|
||||
test "x${enable_serial_host_configure}" = xno ||
|
||||
for item in ${configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
*) echo "${item}/Makefile: ${olditem}/Makefile" >> serdep.tmp ;;
|
||||
*) echo "configure-${item}: configure-${olditem}" >> serdep.tmp ;;
|
||||
esac
|
||||
olditem=${item}
|
||||
done
|
||||
olditem=
|
||||
test "x${enable_serial_configure}" = xno ||
|
||||
test "x${enable_serial_target_configure}" = xno ||
|
||||
for item in ${target_configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
*) echo "\$(TARGET_SUBDIR)/${item}/Makefile: \$(TARGET_SUBDIR)/${olditem}/Makefile" >> serdep.tmp ;;
|
||||
*) echo "configure-target-${item}: configure-target-${olditem}" >> serdep.tmp ;;
|
||||
esac
|
||||
olditem=${item}
|
||||
done
|
||||
serialization_dependencies=serdep.tmp
|
||||
|
||||
|
||||
# Base args. Strip norecursion, cache-file, srcdir, host, build, target.
|
||||
# These are the ones we might not want to pass down to subconfigures.
|
||||
baseargs=`echo "${ac_configure_args}" | \
|
||||
sed -e 's/--no[^ ]*//' \
|
||||
-e 's/--cache[a-z-]*=[^ ]*//' \
|
||||
-e 's/--sr[a-z-]*=[^ ]*//' \
|
||||
-e 's/--ho[a-z-]*=[^ ]*//' \
|
||||
-e 's/--bu[a-z-]*=[^ ]*//' \
|
||||
-e 's/--ta[a-z-]*=[^ ]*//'`
|
||||
# Base args. Strip norecursion, cache-file, srcdir, host, build,
|
||||
# target and nonopt. These are the ones we might not want to pass
|
||||
# down to subconfigures.
|
||||
baseargs=`echo " ${ac_configure_args} " | \
|
||||
sed -e 's/ --no[^ ]* / /' \
|
||||
-e 's/ --cache[a-z-]*=[^ ]* / /' \
|
||||
-e 's/ --sr[a-z-]*=[^ ]* / /' \
|
||||
-e 's/ --ho[a-z-]*=[^ ]* / /' \
|
||||
-e 's/ --bu[a-z-]*=[^ ]* / /' \
|
||||
-e 's/ --ta[a-z-]*=[^ ]* / /' \
|
||||
-e 's/ [^-][^ ]* / /' \
|
||||
-e 's/^ *//;s/ *$//'`
|
||||
|
||||
# For the build-side libraries, we just need to pretend we're native,
|
||||
# and not use the same cache file. Multilibs are neither needed nor
|
||||
|
|
@ -2661,7 +2684,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:2665: checking for $ac_word" >&5
|
||||
echo "configure:2688: 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
|
||||
|
|
@ -2694,7 +2717,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:2698: checking for $ac_word" >&5
|
||||
echo "configure:2721: 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
|
||||
|
|
@ -2733,7 +2756,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:2737: checking for $ac_word" >&5
|
||||
echo "configure:2760: 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
|
||||
|
|
@ -2766,7 +2789,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:2770: checking for $ac_word" >&5
|
||||
echo "configure:2793: 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
|
||||
|
|
@ -2805,7 +2828,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:2809: checking for $ac_word" >&5
|
||||
echo "configure:2832: 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
|
||||
|
|
@ -2838,7 +2861,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:2842: checking for $ac_word" >&5
|
||||
echo "configure:2865: 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
|
||||
|
|
@ -2877,7 +2900,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:2881: checking for $ac_word" >&5
|
||||
echo "configure:2904: 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
|
||||
|
|
@ -2910,7 +2933,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:2914: checking for $ac_word" >&5
|
||||
echo "configure:2937: 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
|
||||
|
|
@ -2949,7 +2972,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:2953: checking for $ac_word" >&5
|
||||
echo "configure:2976: 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
|
||||
|
|
@ -2982,7 +3005,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:2986: checking for $ac_word" >&5
|
||||
echo "configure:3009: 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
|
||||
|
|
@ -3021,7 +3044,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:3025: checking for $ac_word" >&5
|
||||
echo "configure:3048: 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
|
||||
|
|
@ -3054,7 +3077,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:3058: checking for $ac_word" >&5
|
||||
echo "configure:3081: 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
|
||||
|
|
@ -3093,7 +3116,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:3097: checking for $ac_word" >&5
|
||||
echo "configure:3120: 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
|
||||
|
|
@ -3126,7 +3149,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:3130: checking for $ac_word" >&5
|
||||
echo "configure:3153: 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
|
||||
|
|
@ -3165,7 +3188,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:3169: checking for $ac_word" >&5
|
||||
echo "configure:3192: 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
|
||||
|
|
@ -3198,7 +3221,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:3202: checking for $ac_word" >&5
|
||||
echo "configure:3225: 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
|
||||
|
|
@ -3237,7 +3260,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:3241: checking for $ac_word" >&5
|
||||
echo "configure:3264: 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
|
||||
|
|
@ -3270,7 +3293,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:3274: checking for $ac_word" >&5
|
||||
echo "configure:3297: 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
|
||||
|
|
@ -3318,7 +3341,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:3322: checking for $ac_word" >&5
|
||||
echo "configure:3345: 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
|
||||
|
|
@ -3351,7 +3374,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:3355: checking for $ac_word" >&5
|
||||
echo "configure:3378: 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
|
||||
|
|
@ -3390,7 +3413,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:3394: checking for $ac_word" >&5
|
||||
echo "configure:3417: 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
|
||||
|
|
@ -3423,7 +3446,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:3427: checking for $ac_word" >&5
|
||||
echo "configure:3450: 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
|
||||
|
|
@ -3462,7 +3485,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:3466: checking for $ac_word" >&5
|
||||
echo "configure:3489: 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
|
||||
|
|
@ -3495,7 +3518,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:3499: checking for $ac_word" >&5
|
||||
echo "configure:3522: 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
|
||||
|
|
@ -3534,7 +3557,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:3538: checking for $ac_word" >&5
|
||||
echo "configure:3561: 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
|
||||
|
|
@ -3567,7 +3590,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:3571: checking for $ac_word" >&5
|
||||
echo "configure:3594: 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
|
||||
|
|
@ -3606,7 +3629,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:3610: checking for $ac_word" >&5
|
||||
echo "configure:3633: 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
|
||||
|
|
@ -3639,7 +3662,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:3643: checking for $ac_word" >&5
|
||||
echo "configure:3666: 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
|
||||
|
|
@ -3678,7 +3701,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:3682: checking for $ac_word" >&5
|
||||
echo "configure:3705: 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
|
||||
|
|
@ -3711,7 +3734,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:3715: checking for $ac_word" >&5
|
||||
echo "configure:3738: 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
|
||||
|
|
@ -3750,7 +3773,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:3754: checking for $ac_word" >&5
|
||||
echo "configure:3777: 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
|
||||
|
|
@ -3783,7 +3806,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:3787: checking for $ac_word" >&5
|
||||
echo "configure:3810: 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
|
||||
|
|
|
|||
43
configure.in
43
configure.in
|
|
@ -112,7 +112,7 @@ else
|
|||
;;
|
||||
* )
|
||||
# Add to all subconfigure arguments: build, host, and target.
|
||||
ac_configure_args="--with-gcc-version-trigger=$gcc_version_trigger $ac_configure_args"
|
||||
ac_configure_args="$ac_configure_args --with-gcc-version-trigger=$gcc_version_trigger"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
@ -1686,6 +1686,7 @@ esac
|
|||
|
||||
# Create the 'maybe dependencies'. This uses a temporary file.
|
||||
rm -f maybedep.tmp
|
||||
echo '# maybedep.tmp' > maybedep.tmp
|
||||
for item in ${all_build_modules} ${all_host_modules} ${all_target_modules} \
|
||||
${install_host_modules} ${install_target_modules} \
|
||||
${configure_build_modules} ${configure_host_modules} ${configure_target_modules} \
|
||||
|
|
@ -1697,45 +1698,61 @@ 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
|
||||
sub-packages for the host, target or build
|
||||
machine, or of any sub-packages at all])
|
||||
|
||||
# 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 ||
|
||||
for item in ${build_configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
*) echo "\$(BUILD_SUBDIR)/${item}/Makefile: \$(BUILD_SUBDIR)/${olditem}/Makefile" >> serdep.tmp ;;
|
||||
*) echo "configure-build-${item}: configure-build-${olditem}" >> serdep.tmp ;;
|
||||
esac
|
||||
olditem=${item}
|
||||
done
|
||||
olditem=
|
||||
test "x${enable_serial_configure}" = xno ||
|
||||
test "x${enable_serial_host_configure}" = xno ||
|
||||
for item in ${configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
*) echo "${item}/Makefile: ${olditem}/Makefile" >> serdep.tmp ;;
|
||||
*) echo "configure-${item}: configure-${olditem}" >> serdep.tmp ;;
|
||||
esac
|
||||
olditem=${item}
|
||||
done
|
||||
olditem=
|
||||
test "x${enable_serial_configure}" = xno ||
|
||||
test "x${enable_serial_target_configure}" = xno ||
|
||||
for item in ${target_configdirs} ; do
|
||||
case ${olditem} in
|
||||
"") ;;
|
||||
*) echo "\$(TARGET_SUBDIR)/${item}/Makefile: \$(TARGET_SUBDIR)/${olditem}/Makefile" >> serdep.tmp ;;
|
||||
*) echo "configure-target-${item}: configure-target-${olditem}" >> serdep.tmp ;;
|
||||
esac
|
||||
olditem=${item}
|
||||
done
|
||||
serialization_dependencies=serdep.tmp
|
||||
AC_SUBST_FILE(serialization_dependencies)
|
||||
|
||||
# Base args. Strip norecursion, cache-file, srcdir, host, build, target.
|
||||
# These are the ones we might not want to pass down to subconfigures.
|
||||
baseargs=`echo "${ac_configure_args}" | \
|
||||
sed -e 's/--no[[^ ]]*//' \
|
||||
-e 's/--cache[[a-z-]]*=[[^ ]]*//' \
|
||||
-e 's/--sr[[a-z-]]*=[[^ ]]*//' \
|
||||
-e 's/--ho[[a-z-]]*=[[^ ]]*//' \
|
||||
-e 's/--bu[[a-z-]]*=[[^ ]]*//' \
|
||||
-e 's/--ta[[a-z-]]*=[[^ ]]*//'`
|
||||
# Base args. Strip norecursion, cache-file, srcdir, host, build,
|
||||
# target and nonopt. These are the ones we might not want to pass
|
||||
# down to subconfigures.
|
||||
baseargs=`echo " ${ac_configure_args} " | \
|
||||
sed -e 's/ --no[[^ ]]* / /' \
|
||||
-e 's/ --cache[[a-z-]]*=[[^ ]]* / /' \
|
||||
-e 's/ --sr[[a-z-]]*=[[^ ]]* / /' \
|
||||
-e 's/ --ho[[a-z-]]*=[[^ ]]* / /' \
|
||||
-e 's/ --bu[[a-z-]]*=[[^ ]]* / /' \
|
||||
-e 's/ --ta[[a-z-]]*=[[^ ]]* / /' \
|
||||
-e 's/ [[^-][^ ]*] / /' \
|
||||
-e 's/^ *//;s/ *$//'`
|
||||
|
||||
# For the build-side libraries, we just need to pretend we're native,
|
||||
# and not use the same cache file. Multilibs are neither needed nor
|
||||
|
|
|
|||
Loading…
Reference in New Issue