Commit 54fdc474 by Daniel Jacobowitz Committed by Daniel Jacobowitz

Makefile.tpl (all-target): Correct @if conditional for target modules.

	* Makefile.tpl (all-target): Correct @if conditional for target
	modules.
	* configure.in: Omit libiberty if building only target libgcc.
	* configure, Makefile.in: Regenerated.

From-SVN: r120494
parent b3c6d2ea
2007-01-05 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile.tpl (all-target): Correct @if conditional for target
modules.
* configure.in: Omit libiberty if building only target libgcc.
* configure, Makefile.in: Regenerated.
2007-01-04 Paolo Bonzini <bonzini@gnu.org> 2007-01-04 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Use DEV-PHASE to detect the default for --enable-werror. * configure.in: Use DEV-PHASE to detect the default for --enable-werror.
......
...@@ -794,9 +794,9 @@ all-target: maybe-all-target-libstdc++-v3 ...@@ -794,9 +794,9 @@ all-target: maybe-all-target-libstdc++-v3
all-target: maybe-all-target-libmudflap all-target: maybe-all-target-libmudflap
all-target: maybe-all-target-libssp all-target: maybe-all-target-libssp
all-target: maybe-all-target-newlib all-target: maybe-all-target-newlib
@if libgcc-no-bootstrap @if target-libgcc-no-bootstrap
all-target: maybe-all-target-libgcc all-target: maybe-all-target-libgcc
@endif libgcc-no-bootstrap @endif target-libgcc-no-bootstrap
all-target: maybe-all-target-libgfortran all-target: maybe-all-target-libgfortran
all-target: maybe-all-target-libobjc all-target: maybe-all-target-libobjc
all-target: maybe-all-target-libtermcap all-target: maybe-all-target-libtermcap
...@@ -531,9 +531,10 @@ all-host: maybe-all-[+module+][+ IF bootstrap +] ...@@ -531,9 +531,10 @@ all-host: maybe-all-[+module+][+ IF bootstrap +]
.PHONY: all-target .PHONY: all-target
[+ FOR target_modules +][+ IF bootstrap +] [+ FOR target_modules +][+ IF bootstrap +]
@if [+module+]-no-bootstrap[+ ENDIF bootstrap +] @if target-[+module+]-no-bootstrap[+ ENDIF bootstrap +]
all-target: maybe-all-target-[+module+][+ IF bootstrap +] all-target: maybe-all-target-[+module+][+ IF bootstrap +]
@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR target_modules +] @endif target-[+module+]-no-bootstrap[+
ENDIF bootstrap +][+ ENDFOR target_modules +]
# Do a target for all the subdirectories. A ``make do-X'' will do a # Do a target for all the subdirectories. A ``make do-X'' will do a
# ``make X'' in all subdirectories (because, in general, there is a # ``make X'' in all subdirectories (because, in general, there is a
......
...@@ -1439,10 +1439,14 @@ done ...@@ -1439,10 +1439,14 @@ done
# Sometimes the tools are distributed with libiberty but with no other # Sometimes the tools are distributed with libiberty but with no other
# libraries. In that case, we don't want to build target-libiberty. # libraries. In that case, we don't want to build target-libiberty.
# Don't let libgcc imply libiberty either.
if test -n "${target_configdirs}" ; then if test -n "${target_configdirs}" ; then
libgcc=
others= others=
for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do
if test "$i" != "libiberty" ; then if test "$i" = "libgcc"; then
libgcc=target-libgcc
elif test "$i" != "libiberty" ; then
if test -r $srcdir/$i/configure ; then if test -r $srcdir/$i/configure ; then
others=yes; others=yes;
break; break;
...@@ -1450,7 +1454,7 @@ if test -n "${target_configdirs}" ; then ...@@ -1450,7 +1454,7 @@ if test -n "${target_configdirs}" ; then
fi fi
done done
if test -z "${others}" ; then if test -z "${others}" ; then
target_configdirs= target_configdirs=$libgcc
fi fi
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment