Makefile.tpl: Generate normal dependencies if the LHS module is not bootstrapped.

* Makefile.tpl: Generate normal dependencies if the LHS module is
	not bootstrapped.
	* Makefile.in: Regenerate.

From-SVN: r91857
This commit is contained in:
Matt Kraai 2004-12-08 07:22:47 +00:00 committed by Matt Kraai
parent 7c82106ff9
commit 893f1e8768
3 changed files with 10 additions and 10 deletions

View File

@ -1,3 +1,9 @@
2004-12-07 Matt Kraai <kraai@ftbfs.org>
* Makefile.tpl: Generate normal dependencies if the LHS module is
not bootstrapped.
* Makefile.in: Regenerate.
2004-12-03 Richard Sandiford <rsandifo@redhat.com>
* configure.in: Include config/gxx-include-dir.m4. Use

View File

@ -35172,13 +35172,6 @@ all-stage4-gcc: maybe-all-stage4-libiberty
all-stageprofile-gcc: maybe-all-stageprofile-libiberty
all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty
all-gcc: maybe-all-fixincludes
all-stage1-gcc: maybe-all-stage1-fixincludes
all-stage2-gcc: maybe-all-stage2-fixincludes
all-stage3-gcc: maybe-all-stage3-fixincludes
all-stage4-gcc: maybe-all-stage4-fixincludes
all-stageprofile-gcc: maybe-all-stageprofile-fixincludes
all-stagefeedback-gcc: maybe-all-stagefeedback-fixincludes
install-gcc: maybe-install-fixincludes
configure-libcpp: configure-libiberty

View File

@ -1625,8 +1625,8 @@ configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
(define dep-maybe (lambda ()
(if (exist? "hard") "" "maybe-")))
;; dep-kind returns "normal" is the dependency is on an "install" target,
;; or if the LHS module is not bootstrapped. It returns "bootstrap" for
;; dep-kind returns "normal" if the dependency is on an "install" target,
;; or if either 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 build module (e.g. all-gcc on all-build-bison). All this
@ -1638,7 +1638,8 @@ configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
(if (or (= (dep-subtarget "on") "install-")
(=* (dep-module "on") "target-")
(not (hash-ref boot-modules (dep-module "module"))))
(not (hash-ref boot-modules (dep-module "module")))
(not (hash-ref boot-modules (dep-module "on"))))
"normal"
"bootstrap"))))