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

not bootstrapped.
* Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 5863f89cd78192d337981295ce6c20e0fe414a0e..4d2f3cf6243bb3023695c60832f53631ba3b804b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/Makefile.in b/Makefile.in
index 63dc6eaa8e709cb5c7e84369fa869e22e6a3b68d..45c405930a45e596399a8b1e697f0d8aaec7c564 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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
 

diff --git a/Makefile.tpl b/Makefile.tpl
index da82258e438ebdbe7cdc3323b45a04f568264bee..44c15fd53cc0fac0647d14907086af47329baa36 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -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"))))