Makefile.def (bootstrap stages): Add 'lean' parameter.
2004-08-26 Paolo Bonzini <bonzini@gnu.org> * Makefile.def (bootstrap stages): Add 'lean' parameter. * Makefile.tpl (configure-stageN-*, all-stageN-*): Turned into phony targets; do not generate timestamp files. (distclean-stageN): Remove references to their timestamp files. (restageN, touch-stageN): Remove. (stageN-bubble): Rewritten. (compare): Support lean bootstraps. * Makefile.in: Regenerate. * configure.in: Only warn when bootstrapping but build != host or build != target. Support lean bootstraps. * configure: Regenerate. From-SVN: r86754
This commit is contained in:
Paolo Bonzini
Paolo Bonzini
parent
afa396ff84
commit
ce521a9c85
6 changed files with 978 additions and 1302 deletions
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,18 @@
|
|||
2004-08-26 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* Makefile.def (bootstrap stages): Add 'lean' parameter.
|
||||
* Makefile.tpl (configure-stageN-*, all-stageN-*): Turned into
|
||||
phony targets; do not generate timestamp files.
|
||||
(distclean-stageN): Remove references to their timestamp files.
|
||||
(restageN, touch-stageN): Remove.
|
||||
(stageN-bubble): Rewritten.
|
||||
(compare): Support lean bootstraps.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
* configure.in: Only warn when bootstrapping but
|
||||
build != host or build != target. Support lean bootstraps.
|
||||
* configure: Regenerate.
|
||||
|
||||
2004-08-26 Phil Edwards <phil@codesourcery.com>
|
||||
|
||||
* configure.in: Give a better error message if GMP/MPFR are missing
|
||||
|
|
|
|||
|
|
@ -445,14 +445,14 @@ bootstrap_stage = {
|
|||
stage_configure_flags="@stage2_werror_flag@" ;
|
||||
stage_make_flags="" ; };
|
||||
bootstrap_stage = {
|
||||
id=3 ; prev=2 ;
|
||||
id=3 ; prev=2 ; lean=1 ;
|
||||
compare_target=compare ;
|
||||
bootstrap_target=bootstrap ;
|
||||
cleanstrap_target=cleanstrap ;
|
||||
stage_configure_flags="@stage2_werror_flag@" ;
|
||||
stage_make_flags="" ; };
|
||||
bootstrap_stage = {
|
||||
id=4 ; prev=3 ;
|
||||
id=4 ; prev=3 ; lean=2 ;
|
||||
compare_target=compare3 ;
|
||||
bootstrap_target=bootstrap4 ;
|
||||
stage_configure_flags="@stage2_werror_flag@" ;
|
||||
|
|
|
|||
1954
Makefile.in
1954
Makefile.in
File diff suppressed because it is too large
Load diff
88
Makefile.tpl
88
Makefile.tpl
|
|
@ -1376,19 +1376,19 @@ POSTSTAGE1_FLAGS_TO_PASS = \
|
|||
.PHONY: stage[+id+]-start stage[+id+]-end
|
||||
|
||||
stage[+id+]-start::
|
||||
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
|
||||
@[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
|
||||
echo stage[+id+] > stage_current ; \
|
||||
echo stage[+id+] > stage_last[+ FOR host_modules +][+ IF bootstrap +]
|
||||
@if [+ module +]
|
||||
[ -d stage[+id+]-[+module+] ] || mkdir stage[+id+]-[+module+]; \
|
||||
@[ -d stage[+id+]-[+module+] ] || mkdir stage[+id+]-[+module+]; \
|
||||
set stage[+id+]-[+module+] [+module+] ; @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \
|
||||
set stage[+prev+]-[+module+] prev-[+module+] ; @CREATE_LINK_TO_DIR@ [+ ENDIF prev +]
|
||||
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
|
||||
|
||||
stage[+id+]-end::
|
||||
rm -f stage_current[+ FOR host_modules +][+ IF bootstrap +]
|
||||
@rm -f stage_current[+ FOR host_modules +][+ IF bootstrap +]
|
||||
@if [+ module +]
|
||||
set [+module+] stage[+id+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \
|
||||
@set [+module+] stage[+id+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \
|
||||
set prev-[+module+] stage[+prev+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ ENDIF prev +]
|
||||
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
|
||||
|
||||
|
|
@ -1396,12 +1396,14 @@ stage[+id+]-end::
|
|||
# are remade, but not reconfigured. The next stage (if any) will not
|
||||
# be reconfigured as well.
|
||||
.PHONY: stage[+id+]-bubble
|
||||
stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
|
||||
@case `echo all-stage[+id+]-*` in \
|
||||
'all-stage[+id+]-*') ;; \
|
||||
*) echo Remaking stage [+id+] ; rm -f all-stage[+id+]-* ;; \
|
||||
esac ; \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]
|
||||
stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +][+IF lean +]
|
||||
@bootstrap_lean@-rm -rf stage[+lean+]-* ; $(STAMP) stage[+lean+]-lean[+ ENDIF lean +]
|
||||
@if test -f stage[+id+]-lean [+
|
||||
IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \
|
||||
echo Skipping rebuild of stage[+id+] ; \
|
||||
else \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \
|
||||
fi
|
||||
|
||||
.PHONY: all-stage[+id+]
|
||||
all-stage[+id+]: [+ FOR host_modules +][+ IF bootstrap +]\
|
||||
|
|
@ -1409,19 +1411,17 @@ all-stage[+id+]: [+ FOR host_modules +][+ IF bootstrap +]\
|
|||
ENDIF bootstrap+] [+ ENDFOR host_modules +]
|
||||
|
||||
[+ FOR host_modules +][+ IF bootstrap +]
|
||||
.PHONY: configure-stage[+id+]-[+module+] maybe-configure-stage[+id+]-[+module+]
|
||||
.PHONY: all-stage[+id+]-[+module+] maybe-all-stage[+id+]-[+module+]
|
||||
|
||||
maybe-configure-stage[+id+]-[+module+]:
|
||||
maybe-all-stage[+id+]-[+module+]:
|
||||
|
||||
@if [+module+]-bootstrap
|
||||
maybe-configure-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
|
||||
configure-stage[+id+]-[+module+]: [+ IF prev +] maybe-all-stage[+prev+]-[+module+] [+ ENDIF prev +]
|
||||
$(MAKE) stage[+id+]-start
|
||||
@if [ -f stage[+id+]-[+module+]/Makefile ] ; then \
|
||||
$(STAMP) configure-stage[+id+]-[+module+] ; \
|
||||
exit 0; \
|
||||
else \
|
||||
true ; \
|
||||
fi ; \
|
||||
configure-stage[+id+]-[+module+]:
|
||||
@$(MAKE) stage[+id+]-start
|
||||
@[ -f [+module+]/Makefile ] && exit 0 || : ; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
|
||||
$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
|
||||
|
|
@ -1441,12 +1441,11 @@ configure-stage[+id+]-[+module+]: [+ IF prev +] maybe-all-stage[+prev+]-[+module
|
|||
esac; \
|
||||
$(SHELL) $${libsrcdir}/configure \
|
||||
$(HOST_CONFIGARGS) $${srcdiroption} \
|
||||
[+stage_configure_flags+] [+extra_configure_flags+] && \
|
||||
$(STAMP) ../configure-stage[+id+]-[+module+]
|
||||
[+stage_configure_flags+] [+extra_configure_flags+]
|
||||
|
||||
maybe-all-stage[+id+]-[+module+]: all-stage[+id+]-[+module+]
|
||||
all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
|
||||
$(MAKE) stage[+id+]-start
|
||||
@$(MAKE) stage[+id+]-start
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
|
||||
$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
|
||||
|
|
@ -1454,8 +1453,7 @@ all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
|
|||
cd [+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+ IF prev +] \
|
||||
$(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \
|
||||
[+stage_make_flags+] [+extra_make_flags+] && \
|
||||
$(STAMP) ../all-stage[+id+]-[+module+]
|
||||
[+stage_make_flags+] [+extra_make_flags+]
|
||||
@endif [+module+]-bootstrap
|
||||
[+ ENDIF bootstrap +][+ ENDFOR host_modules +]
|
||||
|
||||
|
|
@ -1463,8 +1461,12 @@ all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
|
|||
# only possibility, but now it conflicts with no-bootstrap rules
|
||||
@if gcc-bootstrap
|
||||
[+ IF compare-target +]
|
||||
[+compare-target+]: all-stage[+id+]-gcc
|
||||
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
|
||||
[+compare-target+]:
|
||||
@if test -f stage[+prev+]-lean; then \
|
||||
echo Cannot compare object files as stage [+prev+] was deleted. ; \
|
||||
exit 0 ; \
|
||||
fi; \
|
||||
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
rm -f .bad_compare ; \
|
||||
|
|
@ -1483,50 +1485,24 @@ all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
|
|||
else \
|
||||
true; \
|
||||
fi ; \
|
||||
$(STAMP) [+compare-target+]
|
||||
$(STAMP) [+compare-target+][+ IF prev +]
|
||||
@bootstrap_lean@-rm -rf stage[+prev+]-* ; $(STAMP) stage[+prev+]-lean[+ ENDIF prev +]
|
||||
[+ ENDIF compare-target +]
|
||||
|
||||
[+ IF bootstrap-target +]
|
||||
.PHONY: [+bootstrap-target+]
|
||||
[+bootstrap-target+]: stage[+id+]-bubble [+
|
||||
IF compare-target +] [+compare-target+] [+
|
||||
ENDIF compare-target +] all
|
||||
[+bootstrap-target+]: stage[+id+]-bubble [+compare-target+] all
|
||||
[+ ENDIF bootstrap-target +]
|
||||
|
||||
.PHONY: restage[+id+] touch-stage[+id+] distclean-stage[+id+]
|
||||
.PHONY: distclean-stage[+id+]
|
||||
|
||||
# Rules to wipe a stage and all the following ones, used for cleanstrap
|
||||
[+ IF prev +]distclean-stage[+prev+]:: distclean-stage[+id+] [+ ENDIF prev +]
|
||||
distclean-stage[+id+]::
|
||||
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
|
||||
rm -rf configure-stage[+id+]-* all-stage[+id+]-* stage[+id+]-* [+
|
||||
rm -rf stage[+id+]-* [+
|
||||
IF compare-target +][+compare-target+] [+ ENDIF compare-target +]
|
||||
|
||||
# Rules to renew the timestamp on a stage and all the following ones
|
||||
[+ IF prev +]touch-stage[+prev+]:: touch-stage[+id+] [+ ENDIF prev +]
|
||||
touch-stage[+id+]::
|
||||
@case `echo configure-stage[+id+]-*` in \
|
||||
'configure-stage[+id+]-*') ;; \
|
||||
*) \
|
||||
echo '$(STAMP)' configure-stage[+id+]-* && \
|
||||
$(STAMP) configure-stage[+id+]-* ;; \
|
||||
esac ; \
|
||||
case `echo all-stage[+id+]-*` in \
|
||||
'all-stage[+id+]-*') ;; \
|
||||
*) \
|
||||
echo '$(STAMP)' all-stage[+id+]-* && \
|
||||
$(STAMP) all-stage[+id+]-* ;; \
|
||||
esac
|
||||
|
||||
# After building a stage, touch the following ones
|
||||
[+ IF prev +]restage[+prev+]:: touch-stage[+id+] [+ ENDIF prev +]
|
||||
restage[+id+]::
|
||||
rm -rf all-stage[+id+]-* [+
|
||||
IF compare-target +][+compare-target+] [+ ENDIF compare-target +]
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) [+
|
||||
IF compare-target +][+compare-target+] [+
|
||||
ELSE +] all-stage[+id+] [+ ENDIF compare-target +]
|
||||
|
||||
[+ IF cleanstrap-target +]
|
||||
.PHONY: [+cleanstrap-target+]
|
||||
[+cleanstrap-target+]: distclean-stage1 [+bootstrap-target+]
|
||||
|
|
|
|||
131
configure
vendored
131
configure
vendored
|
|
@ -24,7 +24,7 @@ ac_help="$ac_help
|
|||
ac_help="$ac_help
|
||||
--with-gmp=PATH Specify directory for installed GMP library"
|
||||
ac_help="$ac_help
|
||||
--enable-bootstrap Enable bootstrapping [no]"
|
||||
--enable-bootstrap[=lean] Enable bootstrapping [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-serial-[{host,target,build}-]configure
|
||||
Force sequential configuration of
|
||||
|
|
@ -3098,23 +3098,56 @@ if test "${enable_bootstrap+set}" = set; then
|
|||
enableval="$enable_bootstrap"
|
||||
:
|
||||
else
|
||||
enable_bootstrap=no
|
||||
enable_bootstrap=default
|
||||
fi
|
||||
|
||||
if test -d ${srcdir}/gcc; then
|
||||
case "$host:$target:$enable_bootstrap" in
|
||||
$build:$build:yes | *:no) ;;
|
||||
*:yes) { echo "configure: error: cannot bootstrap a cross-compiler" 1>&2; exit 1; } ;;
|
||||
*) { echo "configure: error: invalid option for --enable-bootstrap" 1>&2; exit 1; } ;;
|
||||
esac
|
||||
else
|
||||
if test $enable_bootstrap = yes; then
|
||||
{ echo "configure: error: cannot bootstrap without a compiler" 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
|
||||
# Issue errors and warnings for invalid/strange bootstrap combinations.
|
||||
case "$configdirs" in
|
||||
*gcc*) have_compiler=yes ;;
|
||||
*) have_compiler=no ;;
|
||||
esac
|
||||
|
||||
case "$have_compiler:$host:$target:$enable_bootstrap" in
|
||||
*:*:*:no) ;;
|
||||
|
||||
# Default behavior. (We'll) enable bootstrap if we have a compiler
|
||||
# and we are in a native configuration.
|
||||
yes:$build:$build:default)
|
||||
# This will become 'yes'
|
||||
enable_bootstrap=no ;;
|
||||
|
||||
*:*:*:default)
|
||||
enable_bootstrap=no ;;
|
||||
|
||||
# We have a compiler and we are in a native configuration, bootstrap is ok
|
||||
yes:$build:$build:yes | yes:$build:$build:lean)
|
||||
;;
|
||||
|
||||
# Other configurations, but we have a compiler. Assume the user knows
|
||||
# what he's doing.
|
||||
yes:*:*:yes | yes:*:*:lean)
|
||||
echo "configure: warning: trying to bootstrap a cross compiler" 1>&2
|
||||
;;
|
||||
|
||||
# No compiler: if they passed --enable-bootstrap explicitly, fail
|
||||
no:*:*:yes | no:*:*:lean)
|
||||
{ echo "configure: error: cannot bootstrap without a compiler" 1>&2; exit 1; } ;;
|
||||
|
||||
# Fail if wrong command line
|
||||
*)
|
||||
{ echo "configure: error: invalid option for --enable-bootstrap" 1>&2; exit 1; }
|
||||
;;
|
||||
esac
|
||||
|
||||
# Adjust the toplevel makefile according to whether bootstrap was selected.
|
||||
case "$enable_bootstrap" in
|
||||
yes)
|
||||
bootstrap_lean='#'
|
||||
default_target=bootstrap
|
||||
bootstrap_suffix=bootstrap ;;
|
||||
lean)
|
||||
bootstrap_lean=''
|
||||
default_target=bootstrap
|
||||
bootstrap_suffix=bootstrap ;;
|
||||
no)
|
||||
|
|
@ -3123,6 +3156,7 @@ case "$enable_bootstrap" in
|
|||
esac
|
||||
|
||||
|
||||
|
||||
for module in ${build_configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${build_subdir}/${module}/Makefile; then
|
||||
|
|
@ -3540,7 +3574,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:3544: checking for $ac_word" >&5
|
||||
echo "configure:3578: 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
|
||||
|
|
@ -3573,7 +3607,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:3577: checking for $ac_word" >&5
|
||||
echo "configure:3611: 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
|
||||
|
|
@ -3612,7 +3646,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:3616: checking for $ac_word" >&5
|
||||
echo "configure:3650: 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
|
||||
|
|
@ -3645,7 +3679,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:3649: checking for $ac_word" >&5
|
||||
echo "configure:3683: 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
|
||||
|
|
@ -3684,7 +3718,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:3688: checking for $ac_word" >&5
|
||||
echo "configure:3722: 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
|
||||
|
|
@ -3717,7 +3751,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:3721: checking for $ac_word" >&5
|
||||
echo "configure:3755: 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
|
||||
|
|
@ -3756,7 +3790,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:3760: checking for $ac_word" >&5
|
||||
echo "configure:3794: 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
|
||||
|
|
@ -3789,7 +3823,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:3793: checking for $ac_word" >&5
|
||||
echo "configure:3827: 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
|
||||
|
|
@ -3828,7 +3862,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:3832: checking for $ac_word" >&5
|
||||
echo "configure:3866: 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
|
||||
|
|
@ -3861,7 +3895,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:3865: checking for $ac_word" >&5
|
||||
echo "configure:3899: 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
|
||||
|
|
@ -3900,7 +3934,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:3904: checking for $ac_word" >&5
|
||||
echo "configure:3938: 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
|
||||
|
|
@ -3933,7 +3967,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:3937: checking for $ac_word" >&5
|
||||
echo "configure:3971: 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
|
||||
|
|
@ -3972,7 +4006,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:3976: checking for $ac_word" >&5
|
||||
echo "configure:4010: 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
|
||||
|
|
@ -4005,7 +4039,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:4009: checking for $ac_word" >&5
|
||||
echo "configure:4043: 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
|
||||
|
|
@ -4044,7 +4078,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:4048: checking for $ac_word" >&5
|
||||
echo "configure:4082: 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
|
||||
|
|
@ -4077,7 +4111,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:4081: checking for $ac_word" >&5
|
||||
echo "configure:4115: 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
|
||||
|
|
@ -4116,7 +4150,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:4120: checking for $ac_word" >&5
|
||||
echo "configure:4154: 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
|
||||
|
|
@ -4149,7 +4183,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:4153: checking for $ac_word" >&5
|
||||
echo "configure:4187: 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
|
||||
|
|
@ -4195,7 +4229,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:4199: checking for $ac_word" >&5
|
||||
echo "configure:4233: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4228,7 +4262,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4232: checking for $ac_word" >&5
|
||||
echo "configure:4266: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4267,7 +4301,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:4271: checking for $ac_word" >&5
|
||||
echo "configure:4305: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4300,7 +4334,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4304: checking for $ac_word" >&5
|
||||
echo "configure:4338: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4339,7 +4373,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:4343: checking for $ac_word" >&5
|
||||
echo "configure:4377: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4372,7 +4406,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4376: checking for $ac_word" >&5
|
||||
echo "configure:4410: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4411,7 +4445,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:4415: checking for $ac_word" >&5
|
||||
echo "configure:4449: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4444,7 +4478,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4448: checking for $ac_word" >&5
|
||||
echo "configure:4482: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4483,7 +4517,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:4487: checking for $ac_word" >&5
|
||||
echo "configure:4521: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4516,7 +4550,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4520: checking for $ac_word" >&5
|
||||
echo "configure:4554: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4555,7 +4589,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:4559: checking for $ac_word" >&5
|
||||
echo "configure:4593: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4588,7 +4622,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4592: checking for $ac_word" >&5
|
||||
echo "configure:4626: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4627,7 +4661,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:4631: checking for $ac_word" >&5
|
||||
echo "configure:4665: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4660,7 +4694,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4664: checking for $ac_word" >&5
|
||||
echo "configure:4698: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4745,7 +4779,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:4749: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:4783: 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"
|
||||
|
|
@ -4789,10 +4823,10 @@ esac
|
|||
|
||||
|
||||
# It makes debugging easier if we create as symlinks the stage directories
|
||||
# gcc for stageN-gcc and stage-prev for stage(N-1). In case this is not
|
||||
# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not
|
||||
# possible, however, we can resort to mv.
|
||||
echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
|
||||
echo "configure:4796: checking if symbolic links between directories work" >&5
|
||||
echo "configure:4830: checking if symbolic links between directories work" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -5021,6 +5055,7 @@ s%@CONFIGURED_M4@%$CONFIGURED_M4%g
|
|||
s%@CONFIGURED_FLEX@%$CONFIGURED_FLEX%g
|
||||
s%@CONFIGURED_LEX@%$CONFIGURED_LEX%g
|
||||
s%@CONFIGURED_MAKEINFO@%$CONFIGURED_MAKEINFO%g
|
||||
s%@bootstrap_lean@%$bootstrap_lean%g
|
||||
s%@default_target@%$default_target%g
|
||||
/@serialization_dependencies@/r $serialization_dependencies
|
||||
s%@serialization_dependencies@%%g
|
||||
|
|
|
|||
62
configure.in
62
configure.in
|
|
@ -1695,28 +1695,62 @@ esac
|
|||
# not to nest @if/@endif pairs, because configure will not warn you at all.
|
||||
|
||||
AC_ARG_ENABLE([bootstrap],
|
||||
[ --enable-bootstrap Enable bootstrapping [no]],,
|
||||
enable_bootstrap=no)
|
||||
if test -d ${srcdir}/gcc; then
|
||||
case "$host:$target:$enable_bootstrap" in
|
||||
$build:$build:yes | *:no) ;;
|
||||
*:yes) AC_MSG_ERROR([cannot bootstrap a cross-compiler]) ;;
|
||||
*) AC_MSG_ERROR([invalid option for --enable-bootstrap]) ;;
|
||||
esac
|
||||
else
|
||||
if test $enable_bootstrap = yes; then
|
||||
AC_MSG_ERROR([cannot bootstrap without a compiler])
|
||||
fi
|
||||
fi
|
||||
[ --enable-bootstrap[=lean] Enable bootstrapping [no]],,
|
||||
enable_bootstrap=default)
|
||||
|
||||
# Issue errors and warnings for invalid/strange bootstrap combinations.
|
||||
case "$configdirs" in
|
||||
*gcc*) have_compiler=yes ;;
|
||||
*) have_compiler=no ;;
|
||||
esac
|
||||
|
||||
case "$have_compiler:$host:$target:$enable_bootstrap" in
|
||||
*:*:*:no) ;;
|
||||
|
||||
# Default behavior. (We'll) enable bootstrap if we have a compiler
|
||||
# and we are in a native configuration.
|
||||
yes:$build:$build:default)
|
||||
# This will become 'yes'
|
||||
enable_bootstrap=no ;;
|
||||
|
||||
*:*:*:default)
|
||||
enable_bootstrap=no ;;
|
||||
|
||||
# We have a compiler and we are in a native configuration, bootstrap is ok
|
||||
yes:$build:$build:yes | yes:$build:$build:lean)
|
||||
;;
|
||||
|
||||
# Other configurations, but we have a compiler. Assume the user knows
|
||||
# what he's doing.
|
||||
yes:*:*:yes | yes:*:*:lean)
|
||||
AC_MSG_WARN([trying to bootstrap a cross compiler])
|
||||
;;
|
||||
|
||||
# No compiler: if they passed --enable-bootstrap explicitly, fail
|
||||
no:*:*:yes | no:*:*:lean)
|
||||
AC_MSG_ERROR([cannot bootstrap without a compiler]) ;;
|
||||
|
||||
# Fail if wrong command line
|
||||
*)
|
||||
AC_MSG_ERROR([invalid option for --enable-bootstrap])
|
||||
;;
|
||||
esac
|
||||
|
||||
# Adjust the toplevel makefile according to whether bootstrap was selected.
|
||||
case "$enable_bootstrap" in
|
||||
yes)
|
||||
bootstrap_lean='#'
|
||||
default_target=bootstrap
|
||||
bootstrap_suffix=bootstrap ;;
|
||||
lean)
|
||||
bootstrap_lean=''
|
||||
default_target=bootstrap
|
||||
bootstrap_suffix=bootstrap ;;
|
||||
no)
|
||||
default_target=all
|
||||
bootstrap_suffix=no-bootstrap ;;
|
||||
esac
|
||||
AC_SUBST(bootstrap_lean)
|
||||
AC_SUBST(default_target)
|
||||
|
||||
for module in ${build_configdirs} ; do
|
||||
|
|
@ -2240,7 +2274,7 @@ esac
|
|||
AC_SUBST(stage1_cflags)
|
||||
|
||||
# It makes debugging easier if we create as symlinks the stage directories
|
||||
# gcc for stageN-gcc and stage-prev for stage(N-1). In case this is not
|
||||
# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not
|
||||
# possible, however, we can resort to mv.
|
||||
AC_CACHE_CHECK([if symbolic links between directories work],
|
||||
[gcc_cv_prog_ln_s_dir],
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue