Also build gprbuild, gnatcoll, libgpr, and xmlada from "base_gcc"

alire-project · Oct 20, 2023 · 3d178fb · 3d178fb
1 parent 396ef25
commit 3d178fb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 20 deletions.
diff --git a/specs/gnatcoll.anod b/specs/gnatcoll.anod
@@ -32,7 +32,7 @@ class GNATcoll(spec("common")):
     @property
     def build_deps(self):
         return [
-            Anod.Dependency("gcc", track=True),
+            Anod.Dependency("base_gcc", track=True),
             Anod.Dependency("gprbuild", track=True),
             Anod.Dependency("xmlada", track=True),
             Anod.Dependency("libgpr", track=True),

diff --git a/specs/gprbuild.anod b/specs/gprbuild.anod
@@ -63,7 +63,7 @@ class GPRbuild(spec("gh-artifact")):
     @property
     def build_deps(self):
         deps = [
-            Anod.Dependency("gcc", track=True),
+            Anod.Dependency("base_gcc", track=True),
             Anod.Dependency("gprconfig_kb", require="source_pkg", track=True),
         ]
 
@@ -104,7 +104,7 @@ class GPRbuild(spec("gh-artifact")):
         )
 
     def do_bootstrap(self):
-        for m in ["gcc"]:
+        for m in ["base_gcc"]:
             if m in self.deps:
                 self.deps[m].setenv()
 
@@ -138,7 +138,7 @@ class GPRbuild(spec("gh-artifact")):
         if self.bootstrap:
             return self.do_bootstrap()
 
-        for m in ["gcc", "xmlada", "gprbuild"]:
+        for m in ["base_gcc", "xmlada", "gprbuild"]:
             if m in self.deps:
                 self.deps[m].setenv()
 

diff --git a/specs/libgpr.anod b/specs/libgpr.anod
@@ -34,7 +34,7 @@ class LibGPR(spec("common")):
     @property
     def build_deps(self):
         return [
-            Anod.Dependency("gcc", track=True),
+            Anod.Dependency("base_gcc", track=True),
             Anod.Dependency("gprbuild", track=True),
             Anod.Dependency("xmlada", track=True),
         ]

diff --git a/specs/xmlada.anod b/specs/xmlada.anod
@@ -30,21 +30,8 @@ class XMLAda(spec("common")):
 
     @property
     def build_deps(self):
-        deps = [Anod.Dependency("gprbuild", qualifier="bootstrap")]
-
-        if self.env.is_canadian:
-            deps.append(
-                Anod.Dependency(
-                    name="gcc",
-                    host="build",
-                    target="host",
-                    local_name="canadian-cross-compiler",
-                )
-            )
-        else:
-            deps.append(Anod.Dependency("gcc"))
-
-        return deps
+        return [Anod.Dependency("gprbuild", qualifier="bootstrap"),
+                Anod.Dependency("base_gcc")]
 
     @Anod.primitive()
     def build(self):