2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate. * configure: Regenerate. * Makefile.def (bootstrap-stage): Rename extra_*_flags to stage_*_flags. * Makefile.tpl (configure-[+module+], all-[+module+]): Exit for bootstrapped modules if toplevel bootstrap is going. (GCC bootstrap): Generate per-stage targets for all bootstrapped modules. Adjust for changes in Makefile.def. Enable several rules even in non-bootstrap mode, just to avoid peppering the template with unnecessary "@if/@endif gcc-bootstrap" pairs. (stage-[+prev+]-bubble): Remove. * Makefile.def (Dependencies): Depend on all-build-bison, all-build-flex, all-build-byacc, all-build-texinfo, rather than the host variations. * Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout with BUILD_SUBDIR. (BISON): Update for recent Bisons. (YACC): Fix typo. (cross): Depend on all-build. (all): Do not depend on all-build. (prebootstrap): Remove. (dep-kind): Accept separate prefixes for MODULE and ON variables. (Prebootstrap dependencies): Add them to the per-stage targets and to all-prebootstrap. * configure.in (build_configdirs): Always enable build_tools. (BUILD_DIR_PREFIX): Remove. * Makefile.def (gcc): Add target variable. (gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags. * Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*) in the recursive `make', instead of hardwiring `all'. (Autogenerated TARGET-* variables): New.
This commit is contained in:
Paolo Bonzini
parent
a010d60faf
commit
72b2455a56
6 changed files with 4297 additions and 692 deletions
37
ChangeLog
37
ChangeLog
|
|
@ -1,3 +1,40 @@
|
|||
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* Makefile.in: Regenerate.
|
||||
* configure: Regenerate.
|
||||
|
||||
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
|
||||
stage_*_flags.
|
||||
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
|
||||
for bootstrapped modules if toplevel bootstrap is going.
|
||||
(GCC bootstrap): Generate per-stage targets for all bootstrapped
|
||||
modules. Adjust for changes in Makefile.def. Enable several
|
||||
rules even in non-bootstrap mode, just to avoid peppering the
|
||||
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
|
||||
(stage-[+prev+]-bubble): Remove.
|
||||
|
||||
* Makefile.def (Dependencies): Depend on all-build-bison,
|
||||
all-build-flex, all-build-byacc, all-build-texinfo, rather
|
||||
than the host variations.
|
||||
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
|
||||
with BUILD_SUBDIR.
|
||||
(BISON): Update for recent Bisons.
|
||||
(YACC): Fix typo.
|
||||
(cross): Depend on all-build.
|
||||
(all): Do not depend on all-build.
|
||||
(prebootstrap): Remove.
|
||||
(dep-kind): Accept separate prefixes for MODULE and ON variables.
|
||||
(Prebootstrap dependencies): Add them to the per-stage targets
|
||||
and to all-prebootstrap.
|
||||
* configure.in (build_configdirs): Always enable build_tools.
|
||||
(BUILD_DIR_PREFIX): Remove.
|
||||
|
||||
* Makefile.def (gcc): Add target variable.
|
||||
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
|
||||
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
|
||||
in the recursive `make', instead of hardwiring `all'.
|
||||
(Autogenerated TARGET-* variables): New.
|
||||
|
||||
2004-08-17 Robert Millan <robertmh@gnu.org>
|
||||
|
||||
* configure.in: In noconfigdirs check, match GNU/k*BSD with GNU/Linux
|
||||
|
|
|
|||
98
Makefile.def
98
Makefile.def
|
|
@ -25,7 +25,6 @@ AutoGen definitions Makefile.tpl;
|
|||
// that recursive target in its Makefile.
|
||||
|
||||
build_modules= { module= libiberty; };
|
||||
build_modules= { module= libbanshee; };
|
||||
build_modules= { module= bison; };
|
||||
build_modules= { module= byacc; };
|
||||
build_modules= { module= flex; };
|
||||
|
|
@ -53,6 +52,7 @@ host_modules= { module= find; };
|
|||
host_modules= { module= flex; no_check_cross= true; };
|
||||
host_modules= { module= gas; bootstrap=true; };
|
||||
host_modules= { module= gcc; bootstrap=true;
|
||||
target="`if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi`";
|
||||
extra_make_flags="$(EXTRA_GCC_FLAGS)"; };
|
||||
host_modules= { module= gawk; };
|
||||
host_modules= { module= gettext; };
|
||||
|
|
@ -94,10 +94,10 @@ host_modules= { module= uudecode; };
|
|||
host_modules= { module= wdiff; };
|
||||
host_modules= { module= zip; no_check_cross=true; };
|
||||
host_modules= { module= zlib; no_install=true; no_check=true; bootstrap=true; };
|
||||
host_modules= { module= gdb; with_x=true; };
|
||||
host_modules= { module= expect; with_x=true; };
|
||||
host_modules= { module= guile; with_x=true; };
|
||||
host_modules= { module= tk; with_x=true; };
|
||||
host_modules= { module= gdb; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
|
||||
host_modules= { module= expect; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
|
||||
host_modules= { module= guile; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
|
||||
host_modules= { module= tk; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
|
||||
host_modules= { module= libtermcap; no_check=true;
|
||||
missing=mostlyclean;
|
||||
missing=clean;
|
||||
|
|
@ -238,14 +238,12 @@ dependencies = { module=configure-gcc; on=configure-intl; };
|
|||
dependencies = { module=configure-gcc; on=configure-binutils; };
|
||||
dependencies = { module=configure-gcc; on=configure-gas; };
|
||||
dependencies = { module=configure-gcc; on=configure-ld; };
|
||||
dependencies = { module=configure-gcc; on=configure-bison; };
|
||||
dependencies = { module=configure-gcc; on=configure-flex; };
|
||||
dependencies = { module=all-gcc; on=all-libiberty; hard=true; };
|
||||
dependencies = { module=all-gcc; on=all-intl; };
|
||||
dependencies = { module=all-gcc; on=all-texinfo; };
|
||||
dependencies = { module=all-gcc; on=all-bison; };
|
||||
dependencies = { module=all-gcc; on=all-byacc; };
|
||||
dependencies = { module=all-gcc; on=all-flex; };
|
||||
dependencies = { module=all-gcc; on=all-build-texinfo; };
|
||||
dependencies = { module=all-gcc; on=all-build-bison; };
|
||||
dependencies = { module=all-gcc; on=all-build-byacc; };
|
||||
dependencies = { module=all-gcc; on=all-build-flex; };
|
||||
dependencies = { module=all-gcc; on=all-binutils; };
|
||||
dependencies = { module=all-gcc; on=all-gas; };
|
||||
dependencies = { module=all-gcc; on=all-ld; };
|
||||
|
|
@ -268,8 +266,8 @@ dependencies = { module=all-gdb; on=all-libiberty; };
|
|||
dependencies = { module=all-gdb; on=all-opcodes; };
|
||||
dependencies = { module=all-gdb; on=all-bfd; };
|
||||
dependencies = { module=all-gdb; on=all-readline; };
|
||||
dependencies = { module=all-gdb; on=all-bison; };
|
||||
dependencies = { module=all-gdb; on=all-byacc; };
|
||||
dependencies = { module=all-gdb; on=all-build-bison; };
|
||||
dependencies = { module=all-gdb; on=all-build-byacc; };
|
||||
dependencies = { module=all-gdb; on=all-sim; };
|
||||
dependencies = { module=install-gdb; on=install-tcl; };
|
||||
dependencies = { module=install-gdb; on=install-tk; };
|
||||
|
|
@ -290,9 +288,9 @@ dependencies = { module=all-bfd; on=all-intl; };
|
|||
dependencies = { module=all-binutils; on=all-libiberty; };
|
||||
dependencies = { module=all-binutils; on=all-opcodes; };
|
||||
dependencies = { module=all-binutils; on=all-bfd; };
|
||||
dependencies = { module=all-binutils; on=all-flex; };
|
||||
dependencies = { module=all-binutils; on=all-bison; };
|
||||
dependencies = { module=all-binutils; on=all-byacc; };
|
||||
dependencies = { module=all-binutils; on=all-build-flex; };
|
||||
dependencies = { module=all-binutils; on=all-build-bison; };
|
||||
dependencies = { module=all-binutils; on=all-build-byacc; };
|
||||
dependencies = { module=all-binutils; on=all-intl; };
|
||||
|
||||
// We put install-opcodes before install-binutils because the installed
|
||||
|
|
@ -314,9 +312,9 @@ dependencies = { module=all-gprof; on=all-intl; };
|
|||
dependencies = { module=all-ld; on=all-libiberty; };
|
||||
dependencies = { module=all-ld; on=all-bfd; };
|
||||
dependencies = { module=all-ld; on=all-opcodes; };
|
||||
dependencies = { module=all-ld; on=all-bison; };
|
||||
dependencies = { module=all-ld; on=all-byacc; };
|
||||
dependencies = { module=all-ld; on=all-flex; };
|
||||
dependencies = { module=all-ld; on=all-build-bison; };
|
||||
dependencies = { module=all-ld; on=all-build-byacc; };
|
||||
dependencies = { module=all-ld; on=all-build-flex; };
|
||||
dependencies = { module=all-ld; on=all-intl; };
|
||||
|
||||
dependencies = { module=all-opcodes; on=all-bfd; };
|
||||
|
|
@ -358,43 +356,43 @@ dependencies = { module=all-sim; on=configure-gdb; };
|
|||
|
||||
// Other host modules.
|
||||
dependencies = { module=all-fastjar; on=all-zlib; };
|
||||
dependencies = { module=all-fastjar; on=all-texinfo; };
|
||||
dependencies = { module=all-fastjar; on=all-build-texinfo; };
|
||||
dependencies = { module=all-fastjar; on=all-libiberty; };
|
||||
|
||||
// Warning, these are not well tested.
|
||||
dependencies = { module=all-autoconf; on=all-m4; };
|
||||
dependencies = { module=all-autoconf; on=all-texinfo; };
|
||||
dependencies = { module=all-autoconf; on=all-build-texinfo; };
|
||||
dependencies = { module=all-automake; on=all-m4; };
|
||||
dependencies = { module=all-automake; on=all-texinfo; };
|
||||
dependencies = { module=all-automake; on=all-build-texinfo; };
|
||||
dependencies = { module=all-automake; on=all-autoconf; };
|
||||
dependencies = { module=all-bison; on=all-intl; };
|
||||
dependencies = { module=all-bison; on=all-texinfo; };
|
||||
dependencies = { module=all-bison; on=all-build-texinfo; };
|
||||
dependencies = { module=all-diff; on=all-intl; };
|
||||
dependencies = { module=all-diff; on=all-texinfo; };
|
||||
dependencies = { module=all-diff; on=all-build-texinfo; };
|
||||
dependencies = { module=all-fileutils; on=all-intl; };
|
||||
dependencies = { module=all-fileutils; on=all-texinfo; };
|
||||
dependencies = { module=all-flex; on=all-bison; };
|
||||
dependencies = { module=all-flex; on=all-byacc; };
|
||||
dependencies = { module=all-fileutils; on=all-build-texinfo; };
|
||||
dependencies = { module=all-flex; on=all-build-bison; };
|
||||
dependencies = { module=all-flex; on=all-build-byacc; };
|
||||
dependencies = { module=all-flex; on=all-intl; };
|
||||
dependencies = { module=all-flex; on=all-m4; };
|
||||
dependencies = { module=all-flex; on=all-texinfo; };
|
||||
dependencies = { module=all-flex; on=all-build-texinfo; };
|
||||
dependencies = { module=all-gzip; on=all-intl; };
|
||||
dependencies = { module=all-gzip; on=all-zlib; };
|
||||
dependencies = { module=all-gzip; on=all-texinfo; };
|
||||
dependencies = { module=all-gzip; on=all-build-texinfo; };
|
||||
dependencies = { module=all-hello; on=all-intl; };
|
||||
dependencies = { module=all-hello; on=all-texinfo; };
|
||||
dependencies = { module=all-hello; on=all-build-texinfo; };
|
||||
dependencies = { module=all-m4; on=all-intl; };
|
||||
dependencies = { module=all-m4; on=all-texinfo; };
|
||||
dependencies = { module=all-m4; on=all-build-texinfo; };
|
||||
dependencies = { module=all-make; on=all-intl; };
|
||||
dependencies = { module=all-make; on=all-texinfo; };
|
||||
dependencies = { module=all-patch; on=all-texinfo; };
|
||||
dependencies = { module=all-make; on=all-texinfo; };
|
||||
dependencies = { module=all-make; on=all-build-texinfo; };
|
||||
dependencies = { module=all-patch; on=all-build-texinfo; };
|
||||
dependencies = { module=all-make; on=all-build-texinfo; };
|
||||
dependencies = { module=all-prms; on=all-libiberty; };
|
||||
dependencies = { module=all-recode; on=all-texinfo; };
|
||||
dependencies = { module=all-sed; on=all-texinfo; };
|
||||
dependencies = { module=all-recode; on=all-build-texinfo; };
|
||||
dependencies = { module=all-sed; on=all-build-texinfo; };
|
||||
dependencies = { module=all-send-pr; on=all-prms; };
|
||||
dependencies = { module=all-tar; on=all-texinfo; };
|
||||
dependencies = { module=all-uudecode; on=all-texinfo; };
|
||||
dependencies = { module=all-tar; on=all-build-texinfo; };
|
||||
dependencies = { module=all-uudecode; on=all-build-texinfo; };
|
||||
|
||||
// Target modules. These can also have dependencies on the language
|
||||
// environment (e.g. on libstdc++).
|
||||
|
|
@ -438,32 +436,32 @@ dependencies = { module=all-target-winsup; on=all-target-libtermcap; };
|
|||
// Toplevel bootstrap
|
||||
bootstrap_stage = {
|
||||
id=1 ;
|
||||
extra_configure_flags='--disable-intermodule \
|
||||
stage_configure_flags='--disable-intermodule \
|
||||
--disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
|
||||
extra_make_flags='CFLAGS="$(STAGE1_CFLAGS)"' ; };
|
||||
stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)"' ; };
|
||||
bootstrap_stage = {
|
||||
id=2 ; prev=1 ;
|
||||
bootstrap_target=bootstrap2 ;
|
||||
extra_configure_flags="@stage2_werror_flag@" ;
|
||||
extra_make_flags="" ; };
|
||||
stage_configure_flags="@stage2_werror_flag@" ;
|
||||
stage_make_flags="" ; };
|
||||
bootstrap_stage = {
|
||||
id=3 ; prev=2 ;
|
||||
compare_target=compare ;
|
||||
bootstrap_target=bootstrap ;
|
||||
cleanstrap_target=cleanstrap ;
|
||||
extra_configure_flags="@stage2_werror_flag@" ;
|
||||
extra_make_flags="" ; };
|
||||
stage_configure_flags="@stage2_werror_flag@" ;
|
||||
stage_make_flags="" ; };
|
||||
bootstrap_stage = {
|
||||
id=4 ; prev=3 ;
|
||||
compare_target=compare3 ;
|
||||
bootstrap_target=bootstrap4 ;
|
||||
extra_configure_flags="@stage2_werror_flag@" ;
|
||||
extra_make_flags="" ; };
|
||||
stage_configure_flags="@stage2_werror_flag@" ;
|
||||
stage_make_flags="" ; };
|
||||
bootstrap_stage = {
|
||||
id=profile ; prev=1 ;
|
||||
extra_configure_flags="@stage2_werror_flag@" ;
|
||||
extra_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"' ; };
|
||||
stage_configure_flags="@stage2_werror_flag@" ;
|
||||
stage_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"' ; };
|
||||
bootstrap_stage = {
|
||||
id=feedback ; prev=1 ;
|
||||
extra_configure_flags="@stage2_werror_flag@" ;
|
||||
extra_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-use"' ; };
|
||||
stage_configure_flags="@stage2_werror_flag@" ;
|
||||
stage_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-use"' ; };
|
||||
|
|
|
|||
4534
Makefile.in
4534
Makefile.in
File diff suppressed because it is too large
Load diff
237
Makefile.tpl
237
Makefile.tpl
|
|
@ -243,43 +243,40 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
|||
|
||||
CXX_FOR_BUILD = $(CXX)
|
||||
|
||||
# Path to the build directory for a Canadian cross, empty otherwise.
|
||||
BUILD_DIR_PREFIX = @BUILD_DIR_PREFIX@
|
||||
|
||||
# Special variables passed down in EXTRA_GCC_FLAGS. They are defined
|
||||
# here so that they can be overridden by Makefile fragments.
|
||||
BUILD_PREFIX = @BUILD_PREFIX@
|
||||
BUILD_PREFIX_1 = @BUILD_PREFIX_1@
|
||||
|
||||
CONFIGURED_BISON = @CONFIGURED_BISON@
|
||||
BISON = `if [ -f $$r/$(BUILD_DIR_PREFIX)/bison/bison ] ; then \
|
||||
echo $$r/$(BUILD_DIR_PREFIX)/bison/bison -L $$s/bison/ ; \
|
||||
BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
|
||||
echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \
|
||||
else \
|
||||
echo ${CONFIGURED_BISON} ; \
|
||||
fi`
|
||||
|
||||
CONFIGURED_YACC = @CONFIGURED_YACC@
|
||||
YACC = `if [ -f $$s/$(BUILD_DIR_PREFIX)/bison/bison ] ; then \
|
||||
echo $$r/$(BUILD_DIR_PREFIX)/bison/bison -y -L $$s/bison/ ; \
|
||||
elif [ -f $$s/$(BUILD_DIR_PREFIX)/byacc/byacc ] ; then \
|
||||
echo $$r/$(BUILD_DIR_PREFIX)/byacc/byacc ; \
|
||||
YACC = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
|
||||
echo $$r/$(BUILD_SUBDIR)/bison/tests/bison -y ; \
|
||||
elif [ -f $$r/$(BUILD_SUBDIR)/byacc/byacc ] ; then \
|
||||
echo $$r/$(BUILD_SUBDIR)/byacc/byacc ; \
|
||||
else \
|
||||
echo ${CONFIGURED_YACC} ; \
|
||||
fi`
|
||||
|
||||
CONFIGURED_FLEX = @CONFIGURED_FLEX@
|
||||
FLEX = `if [ -f $$r/$(BUILD_DIR_PREFIX)/flex/flex ] ; \
|
||||
then echo $$r/$(BUILD_DIR_PREFIX)/flex/flex ; \
|
||||
FLEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
|
||||
then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
|
||||
else echo ${CONFIGURED_FLEX} ; fi`
|
||||
|
||||
CONFIGURED_LEX = @CONFIGURED_LEX@
|
||||
LEX = `if [ -f $$r/$(BUILD_DIR_PREFIX)/flex/flex ] ; \
|
||||
then echo $$r/$(BUILD_DIR_PREFIX)/flex/flex ; \
|
||||
LEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
|
||||
then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
|
||||
else echo ${CONFIGURED_LEX} ; fi`
|
||||
|
||||
CONFIGURED_M4 = @CONFIGURED_M4@
|
||||
M4 = `if [ -f $$r/$(BUILD_DIR_PREFIX)/m4/m4 ] ; \
|
||||
then echo $$r/$(BUILD_DIR_PREFIX)/m4/m4 ; \
|
||||
M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \
|
||||
then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
|
||||
else echo ${CONFIGURED_M4} ; fi`
|
||||
|
||||
# For an installed makeinfo, we require it to be from texinfo 4.2 or
|
||||
|
|
@ -287,8 +284,8 @@ M4 = `if [ -f $$r/$(BUILD_DIR_PREFIX)/m4/m4 ] ; \
|
|||
# makeinfo even if only the Makefile is there, because Texinfo builds its
|
||||
# manual when made, and it requires its own version.
|
||||
CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@
|
||||
MAKEINFO = `if [ -f $$r/$(BUILD_DIR_PREFIX)/texinfo/makeinfo/Makefile ] ; \
|
||||
then echo $$r/$(BUILD_DIR_PREFIX)/texinfo/makeinfo/makeinfo ; \
|
||||
MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
|
||||
then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
|
||||
else if (${CONFIGURED_MAKEINFO} --version \
|
||||
| egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
|
||||
then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
|
||||
|
|
@ -603,7 +600,7 @@ configure-target: [+
|
|||
|
||||
# The target built for a native non-bootstrap build.
|
||||
.PHONY: all
|
||||
all: unstage all-build all-host all-target stage
|
||||
all: unstage all-host all-target stage
|
||||
|
||||
.PHONY: all-build
|
||||
all-build: [+
|
||||
|
|
@ -864,12 +861,14 @@ configure-build-[+module+]:
|
|||
.PHONY: all-build-[+module+] maybe-all-build-[+module+]
|
||||
maybe-all-build-[+module+]:
|
||||
@if build-[+module+]
|
||||
TARGET-build-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
|
||||
maybe-all-build-[+module+]: all-build-[+module+]
|
||||
all-build-[+module+]: configure-build-[+module+]
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(BUILD_EXPORTS) \
|
||||
(cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) [+extra_make_flags+] all)
|
||||
(cd $(BUILD_SUBDIR)/[+module+] && \
|
||||
$(MAKE) [+extra_make_flags+] $(TARGET-build-[+module+]))
|
||||
@endif build-[+module+]
|
||||
[+ ENDFOR build_modules +]
|
||||
|
||||
|
|
@ -882,7 +881,8 @@ maybe-configure-[+module+]:
|
|||
@if [+module+]
|
||||
maybe-configure-[+module+]: configure-[+module+]
|
||||
configure-[+module+]:
|
||||
@test ! -f [+module+]/Makefile || exit 0; \
|
||||
@[+ IF bootstrap +]test -f stage_last && exit 0; \
|
||||
[+ ENDIF bootstrap +]test ! -f [+module+]/Makefile || exit 0; \
|
||||
[ -d [+module+] ] || mkdir [+module+]; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
|
|
@ -910,7 +910,8 @@ maybe-all-[+module+]:
|
|||
@if [+module+]
|
||||
maybe-all-[+module+]: all-[+module+]
|
||||
all-[+module+]: configure-[+module+]
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
@[+ IF bootstrap +]test -f stage_last && exit 0; \
|
||||
[+ ENDIF bootstrap +]r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
|
|
@ -937,10 +938,8 @@ check-[+module+]:
|
|||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
|
||||
IF with_x
|
||||
+] $(X11_FLAGS_TO_PASS)[+
|
||||
ENDIF with_x +] [+extra_make_flags+] check); \
|
||||
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS) [+
|
||||
extra_make_flags+] check); \
|
||||
fi
|
||||
[+ ELSE check +]
|
||||
check-[+module+]:
|
||||
|
|
@ -949,9 +948,7 @@ check-[+module+]:
|
|||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
|
||||
IF with_x
|
||||
+] $(X11_FLAGS_TO_PASS)[+
|
||||
ENDIF with_x +] [+extra_make_flags+] check)
|
||||
extra_make_flags+] check)
|
||||
[+ ENDIF no_check +]
|
||||
@endif [+module+]
|
||||
|
||||
|
|
@ -968,9 +965,7 @@ install-[+module+]: installdirs
|
|||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
|
||||
IF with_x
|
||||
+] $(X11_FLAGS_TO_PASS)[+
|
||||
ENDIF with_x +] [+extra_make_flags+] install)
|
||||
extra_make_flags+] install)
|
||||
[+ ENDIF no_install +]
|
||||
@endif [+module+]
|
||||
|
||||
|
|
@ -1080,6 +1075,7 @@ ENDIF raw_cxx +]
|
|||
.PHONY: all-target-[+module+] maybe-all-target-[+module+]
|
||||
maybe-all-target-[+module+]:
|
||||
@if target-[+module+]
|
||||
TARGET-target-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
|
||||
maybe-all-target-[+module+]: all-target-[+module+]
|
||||
all-target-[+module+]: configure-target-[+module+]
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
|
|
@ -1095,7 +1091,7 @@ ENDIF raw_cxx +]
|
|||
IF raw_cxx
|
||||
+] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+
|
||||
ENDIF raw_cxx
|
||||
+] [+extra_make_flags+] all)
|
||||
+] [+extra_make_flags+] $(TARGET-target-[+module+]))
|
||||
@endif target-[+module+]
|
||||
|
||||
.PHONY: check-target-[+module+] maybe-check-target-[+module+]
|
||||
|
|
@ -1249,7 +1245,7 @@ profiledbootstrap: all-prebootstrap configure-gcc
|
|||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
|
||||
|
||||
.PHONY: cross
|
||||
cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
|
||||
cross: all-build all-gas all-ld
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
|
|
@ -1322,7 +1318,6 @@ stage:
|
|||
@$(MAKE) `cat stage_current`-end
|
||||
@endif gcc-bootstrap
|
||||
|
||||
@if gcc-bootstrap
|
||||
# We name the build directories for the various stages "stage1-gcc",
|
||||
# "stage2-gcc","stage3-gcc", etc.
|
||||
|
||||
|
|
@ -1360,12 +1355,6 @@ STAGE1_LANGUAGES=@stage1_languages@
|
|||
# We only want to compare .o files, so set this!
|
||||
objext = .o
|
||||
|
||||
# Real targets act phony if they depend on phony targets; this hack
|
||||
# prevents gratuitous rebuilding of stage 1.
|
||||
prebootstrap:
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-prebootstrap
|
||||
$(STAMP) prebootstrap
|
||||
|
||||
# Flags to pass to stage2 and later makes.
|
||||
BOOT_CFLAGS= -g -O2
|
||||
POSTSTAGE1_FLAGS_TO_PASS = \
|
||||
|
|
@ -1389,39 +1378,46 @@ POSTSTAGE1_FLAGS_TO_PASS = \
|
|||
stage[+id+]-start::
|
||||
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
|
||||
echo stage[+id+] > stage_current ; \
|
||||
echo stage[+id+] > stage_last ; \
|
||||
[ -d stage[+id+]-gcc ] || mkdir stage[+id+]-gcc; \
|
||||
set stage[+id+]-gcc gcc ; @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \
|
||||
set stage[+prev+]-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ [+ ENDIF prev +]
|
||||
echo stage[+id+] > stage_last[+ FOR host_modules +][+ IF bootstrap +]
|
||||
@if [+ 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 ; \
|
||||
set gcc stage[+id+]-gcc ; @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \
|
||||
set prev-gcc stage[+prev+]-gcc ; @UNDO_LINK_TO_DIR@ [+ ENDIF prev +]
|
||||
rm -f stage_current[+ FOR host_modules +][+ IF bootstrap +]
|
||||
@if [+ module +]
|
||||
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 +]
|
||||
|
||||
# Bubble a bugfix through all the stages up to stage [+id+]. They
|
||||
# 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 +]
|
||||
@if [ -f all-stage[+id+]-gcc ] ; then \
|
||||
echo Remaking stage [+id+] ; \
|
||||
rm -f all-stage[+id+]-gcc ; \
|
||||
fi ; \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]-gcc
|
||||
@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+]
|
||||
|
||||
[+ IF prev +]
|
||||
stage[+prev+]-bubble::
|
||||
@if [ -f configure-stage[+id+]-gcc ] ; then \
|
||||
$(STAMP) configure-stage[+id+]-gcc ; \
|
||||
fi
|
||||
[+ ENDIF prev +]
|
||||
.PHONY: all-stage[+id+]
|
||||
all-stage[+id+]: [+ FOR host_modules +][+ IF bootstrap +]\
|
||||
maybe-all-stage[+id+]-[+module+][+
|
||||
ENDIF bootstrap+] [+ ENDFOR host_modules +]
|
||||
|
||||
configure-stage[+id+]-gcc: [+ IF prev +] all-stage[+prev+]-gcc [+
|
||||
ELSE +] prebootstrap [+ ENDIF prev +]
|
||||
[+ FOR host_modules +][+ IF bootstrap +]
|
||||
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+]-gcc/Makefile ] ; then \
|
||||
$(STAMP) configure-stage[+id+]-gcc ; \
|
||||
@if [ -f stage[+id+]-[+module+]/Makefile ] ; then \
|
||||
$(STAMP) configure-stage[+id+]-[+module+] ; \
|
||||
exit 0; \
|
||||
else \
|
||||
true ; \
|
||||
|
|
@ -1430,35 +1426,42 @@ configure-stage[+id+]-gcc: [+ IF prev +] all-stage[+prev+]-gcc [+
|
|||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
|
||||
$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
|
||||
$(HOST_EXPORTS) [+ ENDIF prev +] \
|
||||
echo Configuring stage [+id+] in gcc ; \
|
||||
cd gcc || exit 1; \
|
||||
echo Configuring stage [+id+] in [+module+] ; \
|
||||
cd [+module+] || exit 1; \
|
||||
case $(srcdir) in \
|
||||
\.) \
|
||||
srcdiroption="--srcdir=."; \
|
||||
libsrcdir=".";; \
|
||||
/* | [A-Za-z]:[\\/]*) \
|
||||
srcdiroption="--srcdir=$(srcdir)/gcc"; \
|
||||
libsrcdir="$$s/gcc";; \
|
||||
srcdiroption="--srcdir=$(srcdir)/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]";; \
|
||||
*) \
|
||||
srcdiroption="--srcdir=../$(srcdir)/gcc"; \
|
||||
libsrcdir="$$s/gcc";; \
|
||||
srcdiroption="--srcdir=../$(srcdir)/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]";; \
|
||||
esac; \
|
||||
$(SHELL) $${libsrcdir}/configure \
|
||||
$(HOST_CONFIGARGS) $${srcdiroption} \
|
||||
[+extra_configure_flags+] && \
|
||||
$(STAMP) ../configure-stage[+id+]-gcc
|
||||
[+stage_configure_flags+] [+extra_configure_flags+] && \
|
||||
$(STAMP) ../configure-stage[+id+]-[+module+]
|
||||
|
||||
all-stage[+id+]-gcc: configure-stage[+id+]-gcc
|
||||
maybe-all-stage[+id+]-[+module+]: all-stage[+id+]-[+module+]
|
||||
all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
|
||||
$(MAKE) stage[+id+]-start
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
|
||||
$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
|
||||
$(HOST_EXPORTS) [+ ENDIF prev +] \
|
||||
cd gcc && \
|
||||
$(MAKE) $(GCC_FLAGS_TO_PASS) [+ IF prev +] \
|
||||
cd [+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+ IF prev +] \
|
||||
$(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \
|
||||
[+extra_make_flags+] && $(STAMP) ../all-stage[+id+]-gcc
|
||||
[+stage_make_flags+] [+extra_make_flags+] && \
|
||||
$(STAMP) ../all-stage[+id+]-[+module+]
|
||||
@endif [+module+]-bootstrap
|
||||
[+ ENDIF bootstrap +][+ ENDFOR host_modules +]
|
||||
|
||||
# FIXME: Will not need to be conditional when toplevel bootstrap is the
|
||||
# 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 || :
|
||||
|
|
@ -1485,8 +1488,7 @@ all-stage[+id+]-gcc: configure-stage[+id+]-gcc
|
|||
|
||||
[+ IF bootstrap-target +]
|
||||
.PHONY: [+bootstrap-target+]
|
||||
[+bootstrap-target+]:
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage[+id+]-bubble [+
|
||||
[+bootstrap-target+]: stage[+id+]-bubble [+
|
||||
IF compare-target +] [+compare-target+] [+
|
||||
ENDIF compare-target +] all
|
||||
[+ ENDIF bootstrap-target +]
|
||||
|
|
@ -1497,33 +1499,39 @@ all-stage[+id+]-gcc: configure-stage[+id+]-gcc
|
|||
[+ 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+]-gcc all-stage[+id+]-gcc stage[+id+]-gcc [+
|
||||
rm -rf configure-stage[+id+]-* all-stage[+id+]-* 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+]::
|
||||
@[ -f configure-stage[+id+]-gcc ] && \
|
||||
echo '$(STAMP) configure-stage[+id+]-gcc' && \
|
||||
$(STAMP) configure-stage[+id+]-gcc; \
|
||||
[ -f all-stage[+id+]-gcc ] && \
|
||||
echo '$(STAMP) all-stage[+id+]-gcc' && \
|
||||
$(STAMP) all-stage[+id+]-gcc; \
|
||||
:
|
||||
@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+]-gcc [+
|
||||
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+]-gcc [+ ENDIF compare-target +]
|
||||
ELSE +] all-stage[+id+] [+ ENDIF compare-target +]
|
||||
|
||||
[+ IF cleanstrap-target +]
|
||||
.PHONY: [+cleanstrap-target+]
|
||||
[+cleanstrap-target+]: distclean-stage1 [+bootstrap-target+]
|
||||
[+ ENDIF cleanstrap-target +]
|
||||
@endif gcc-bootstrap
|
||||
|
||||
[+ ENDFOR bootstrap-stage +]
|
||||
|
||||
|
|
@ -1534,7 +1542,10 @@ stagefeedback-start::
|
|||
{ find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \
|
||||
{ find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); }
|
||||
|
||||
profiledbootstrap: all-prebootstrap configure-gcc
|
||||
# FIXME: Will not need to be conditional when toplevel bootstrap is the
|
||||
# only possibility, but now it conflicts with no-bootstrap rules
|
||||
@if gcc-bootstrap
|
||||
profiledbootstrap:
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
|
|
@ -1552,7 +1563,6 @@ profiledbootstrap: all-prebootstrap configure-gcc
|
|||
$(HOST_EXPORTS) \
|
||||
echo "Building feedback based compiler"; \
|
||||
$(MAKE) stagefeedback-bubble stagefeedback-end
|
||||
|
||||
@endif gcc-bootstrap
|
||||
|
||||
# --------------------------------------
|
||||
|
|
@ -1589,10 +1599,10 @@ configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
|
|||
)))
|
||||
|
||||
;; make-dep builds a dependency from the MODULE and ON AutoGen vars.
|
||||
(define make-dep (lambda (module-kind)
|
||||
(define make-dep (lambda (module-kind on-kind)
|
||||
(string-append
|
||||
(dep-target module-kind "module" #t) ": "
|
||||
(dep-target module-kind "on" (exist? "hard")))))
|
||||
(dep-target on-kind "on" (exist? "hard")))))
|
||||
|
||||
;; dep-subtarget extracts everything up to the first dash in the given
|
||||
;; AutoGen variable, for example it extracts "all-" out of "all-gcc".
|
||||
|
|
@ -1620,23 +1630,21 @@ configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
|
|||
;; or if the LHS module is not bootstrapped. It returns "bootstrap" for
|
||||
;; configure or build dependencies between bootstrapped modules; it returns
|
||||
;; "prebootstrap" for configure or build dependencies of bootstrapped
|
||||
;; modules on a non-bootstrapped modules (e.g. gcc on bison). All this
|
||||
;; modules on a build module (e.g. all-gcc on all-build-bison). All this
|
||||
;; is only necessary for host modules.
|
||||
(define dep-kind (lambda ()
|
||||
(if (or (= (dep-subtarget "on") "install-")
|
||||
(=* (dep-module "on") "build-")
|
||||
(=* (dep-module "on") "target-"))
|
||||
"normal"
|
||||
(if (and (hash-ref boot-modules (dep-module "module"))
|
||||
(=* (dep-module "on") "build-"))
|
||||
"prebootstrap"
|
||||
|
||||
(if (hash-ref boot-modules (dep-module "module"))
|
||||
(if (hash-ref boot-modules (dep-module "on"))
|
||||
"bootstrap"
|
||||
"prebootstrap")
|
||||
"normal"))))
|
||||
(if (or (= (dep-subtarget "on") "install-")
|
||||
(=* (dep-module "on") "target-")
|
||||
(not (hash-ref boot-modules (dep-module "module"))))
|
||||
"normal"
|
||||
"bootstrap"))))
|
||||
|
||||
;; We now build the hash table that is used by dep-kind.
|
||||
(define boot-modules (make-hash-table 113))
|
||||
(define preboot-modules (make-hash-table 37))
|
||||
+]
|
||||
|
||||
[+ FOR host_modules +][+
|
||||
|
|
@ -1649,27 +1657,22 @@ configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
|
|||
# to check for bootstrap/prebootstrap dependencies. To resolve
|
||||
# prebootstrap dependencies, prebootstrap modules are gathered in
|
||||
# a hash table.
|
||||
[+ FOR dependencies +][+ (make-dep "") +]
|
||||
[+ CASE (dep-kind) +][+
|
||||
== "prebootstrap"
|
||||
+][+ (hash-create-handle! preboot-modules (dep-module "on") #t) "" +][+
|
||||
== "bootstrap"
|
||||
[+ FOR dependencies +][+ (make-dep "" "") +]
|
||||
[+ CASE (dep-kind) +]
|
||||
[+ == "prebootstrap"
|
||||
+][+ FOR bootstrap_stage +]
|
||||
[+ (make-dep (dep-stage)) +][+
|
||||
[+ (make-dep (dep-stage) "") +][+
|
||||
ENDFOR bootstrap_stage +]
|
||||
all-prebootstrap: [+ (dep-target "" "on" (exist? "hard")) +]
|
||||
[+ == "bootstrap"
|
||||
+][+ FOR bootstrap_stage +]
|
||||
[+ (make-dep (dep-stage) (dep-stage)) +][+
|
||||
ENDFOR bootstrap_stage +]
|
||||
[+ ESAC +][+
|
||||
ENDFOR dependencies +]
|
||||
|
||||
# Now build the prebootstrap dependencies.
|
||||
[+ FOR host_modules +][+
|
||||
IF (hash-ref preboot-modules (get "module")) +]
|
||||
all-prebootstrap: maybe-all-[+module+][+
|
||||
ENDIF +][+
|
||||
ENDFOR host_modules +]
|
||||
|
||||
# Unless toplevel bootstrap is going, bootstrapped packages are actually
|
||||
# prebootstrapped, with the exception of gcc. Another wart that will go
|
||||
# away with toplevel bootstrap.
|
||||
# Non-toplevel bootstrap rules must depend on several packages, to be built
|
||||
# before gcc. Another wart that will go away, hopefully soon.
|
||||
@if gcc-no-bootstrap
|
||||
[+ FOR host_modules +][+
|
||||
IF (and (not (= (get "module") "gcc"))
|
||||
|
|
|
|||
76
configure
vendored
76
configure
vendored
|
|
@ -939,9 +939,11 @@ target_tools="target-examples target-groff target-gperf target-rda"
|
|||
configdirs=`echo ${host_libs} ${host_tools}`
|
||||
target_configdirs=`echo ${target_libraries} ${target_tools}`
|
||||
|
||||
# Only make build modules if build != host.
|
||||
# Only make build libraries if build != host.
|
||||
if test ${host_alias} != ${build_alias} ; then
|
||||
build_configdirs=`echo ${build_libs} ${build_tools}`
|
||||
else
|
||||
build_configdirs=`echo ${build_tools}`
|
||||
fi
|
||||
|
||||
################################################################################
|
||||
|
|
@ -1769,7 +1771,6 @@ if test "${build}" != "${host}" ; then
|
|||
CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++}
|
||||
GCJ_FOR_TARGET=${GCJ_FOR_TARGET-${target_alias}-gcj}
|
||||
GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
|
||||
BUILD_DIR_PREFIX=${build_subdir}
|
||||
BUILD_PREFIX=${build_alias}-
|
||||
BUILD_PREFIX_1=${build_alias}-
|
||||
|
||||
|
|
@ -1784,7 +1785,6 @@ else
|
|||
|
||||
CC_FOR_BUILD="\$(CC)"
|
||||
GCC_FOR_TARGET="\$(USUAL_GCC_FOR_TARGET)"
|
||||
BUILD_DIR_PREFIX=
|
||||
BUILD_PREFIX=
|
||||
BUILD_PREFIX_1=loser-
|
||||
|
||||
|
|
@ -3504,7 +3504,6 @@ done
|
|||
|
||||
|
||||
|
||||
|
||||
# Build module lists & subconfigure args.
|
||||
|
||||
|
||||
|
|
@ -3531,7 +3530,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:3535: checking for $ac_word" >&5
|
||||
echo "configure:3534: 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
|
||||
|
|
@ -3564,7 +3563,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:3568: checking for $ac_word" >&5
|
||||
echo "configure:3567: 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
|
||||
|
|
@ -3603,7 +3602,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:3607: checking for $ac_word" >&5
|
||||
echo "configure:3606: 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
|
||||
|
|
@ -3636,7 +3635,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:3640: checking for $ac_word" >&5
|
||||
echo "configure:3639: 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
|
||||
|
|
@ -3675,7 +3674,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:3679: checking for $ac_word" >&5
|
||||
echo "configure:3678: 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
|
||||
|
|
@ -3708,7 +3707,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:3712: checking for $ac_word" >&5
|
||||
echo "configure:3711: 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
|
||||
|
|
@ -3747,7 +3746,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:3751: checking for $ac_word" >&5
|
||||
echo "configure:3750: 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
|
||||
|
|
@ -3780,7 +3779,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:3784: checking for $ac_word" >&5
|
||||
echo "configure:3783: 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
|
||||
|
|
@ -3819,7 +3818,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:3823: checking for $ac_word" >&5
|
||||
echo "configure:3822: 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
|
||||
|
|
@ -3852,7 +3851,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:3856: checking for $ac_word" >&5
|
||||
echo "configure:3855: 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
|
||||
|
|
@ -3891,7 +3890,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:3895: checking for $ac_word" >&5
|
||||
echo "configure:3894: 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
|
||||
|
|
@ -3924,7 +3923,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:3928: checking for $ac_word" >&5
|
||||
echo "configure:3927: 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
|
||||
|
|
@ -3963,7 +3962,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:3967: checking for $ac_word" >&5
|
||||
echo "configure:3966: 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
|
||||
|
|
@ -3996,7 +3995,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:4000: checking for $ac_word" >&5
|
||||
echo "configure:3999: 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
|
||||
|
|
@ -4035,7 +4034,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:4039: checking for $ac_word" >&5
|
||||
echo "configure:4038: 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
|
||||
|
|
@ -4068,7 +4067,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:4072: checking for $ac_word" >&5
|
||||
echo "configure:4071: 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
|
||||
|
|
@ -4107,7 +4106,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:4111: checking for $ac_word" >&5
|
||||
echo "configure:4110: 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
|
||||
|
|
@ -4140,7 +4139,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:4144: checking for $ac_word" >&5
|
||||
echo "configure:4143: 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
|
||||
|
|
@ -4186,7 +4185,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:4190: checking for $ac_word" >&5
|
||||
echo "configure:4189: 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
|
||||
|
|
@ -4219,7 +4218,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:4223: checking for $ac_word" >&5
|
||||
echo "configure:4222: 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
|
||||
|
|
@ -4258,7 +4257,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:4262: checking for $ac_word" >&5
|
||||
echo "configure:4261: 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
|
||||
|
|
@ -4291,7 +4290,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:4295: checking for $ac_word" >&5
|
||||
echo "configure:4294: 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
|
||||
|
|
@ -4330,7 +4329,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:4334: checking for $ac_word" >&5
|
||||
echo "configure:4333: 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
|
||||
|
|
@ -4363,7 +4362,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:4367: checking for $ac_word" >&5
|
||||
echo "configure:4366: 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
|
||||
|
|
@ -4402,7 +4401,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:4406: checking for $ac_word" >&5
|
||||
echo "configure:4405: 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
|
||||
|
|
@ -4435,7 +4434,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:4439: checking for $ac_word" >&5
|
||||
echo "configure:4438: 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
|
||||
|
|
@ -4474,7 +4473,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:4478: checking for $ac_word" >&5
|
||||
echo "configure:4477: 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
|
||||
|
|
@ -4507,7 +4506,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:4511: checking for $ac_word" >&5
|
||||
echo "configure:4510: 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
|
||||
|
|
@ -4546,7 +4545,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:4550: checking for $ac_word" >&5
|
||||
echo "configure:4549: 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
|
||||
|
|
@ -4579,7 +4578,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:4583: checking for $ac_word" >&5
|
||||
echo "configure:4582: 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
|
||||
|
|
@ -4618,7 +4617,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:4622: checking for $ac_word" >&5
|
||||
echo "configure:4621: 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
|
||||
|
|
@ -4651,7 +4650,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:4655: checking for $ac_word" >&5
|
||||
echo "configure:4654: 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
|
||||
|
|
@ -4736,7 +4735,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:4740: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:4739: 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"
|
||||
|
|
@ -4783,7 +4782,7 @@ esac
|
|||
# gcc for stageN-gcc and stage-prev 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:4787: checking if symbolic links between directories work" >&5
|
||||
echo "configure:4786: 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
|
||||
|
|
@ -5025,7 +5024,6 @@ s%@alphaieee_frag@%%g
|
|||
s%@ospace_frag@%%g
|
||||
s%@SET_LIB_PATH@%$SET_LIB_PATH%g
|
||||
s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
|
||||
s%@BUILD_DIR_PREFIX@%$BUILD_DIR_PREFIX%g
|
||||
s%@BUILD_PREFIX@%$BUILD_PREFIX%g
|
||||
s%@BUILD_PREFIX_1@%$BUILD_PREFIX_1%g
|
||||
s%@gcc_version_trigger@%$gcc_version_trigger%g
|
||||
|
|
|
|||
|
|
@ -184,9 +184,11 @@ target_tools="target-examples target-groff target-gperf target-rda"
|
|||
configdirs=`echo ${host_libs} ${host_tools}`
|
||||
target_configdirs=`echo ${target_libraries} ${target_tools}`
|
||||
|
||||
# Only make build modules if build != host.
|
||||
# Only make build libraries if build != host.
|
||||
if test ${host_alias} != ${build_alias} ; then
|
||||
build_configdirs=`echo ${build_libs} ${build_tools}`
|
||||
else
|
||||
build_configdirs=`echo ${build_tools}`
|
||||
fi
|
||||
|
||||
################################################################################
|
||||
|
|
@ -985,7 +987,6 @@ if test "${build}" != "${host}" ; then
|
|||
CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++}
|
||||
GCJ_FOR_TARGET=${GCJ_FOR_TARGET-${target_alias}-gcj}
|
||||
GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
|
||||
BUILD_DIR_PREFIX=${build_subdir}
|
||||
BUILD_PREFIX=${build_alias}-
|
||||
BUILD_PREFIX_1=${build_alias}-
|
||||
|
||||
|
|
@ -1000,7 +1001,6 @@ else
|
|||
|
||||
CC_FOR_BUILD="\$(CC)"
|
||||
GCC_FOR_TARGET="\$(USUAL_GCC_FOR_TARGET)"
|
||||
BUILD_DIR_PREFIX=
|
||||
BUILD_PREFIX=
|
||||
BUILD_PREFIX_1=loser-
|
||||
|
||||
|
|
@ -2089,7 +2089,6 @@ AC_SUBST_FILE(ospace_frag)
|
|||
# Miscellanea: directories, flags, etc.
|
||||
AC_SUBST(SET_LIB_PATH)
|
||||
AC_SUBST(RPATH_ENVVAR)
|
||||
AC_SUBST(BUILD_DIR_PREFIX)
|
||||
AC_SUBST(BUILD_PREFIX)
|
||||
AC_SUBST(BUILD_PREFIX_1)
|
||||
AC_SUBST(gcc_version_trigger)
|
||||
|
|
|
|||
Loading…
Reference in a new issue