Change dependencies to build gprbuild, gnatcoll and Ada libraries usi…

…ng the base compiler
alire-project · Nov 8, 2022 · 59b04ac · 59b04ac
1 parent 021ee98
commit 59b04ac
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 34 deletions.
diff --git a/specs/binutils.anod b/specs/binutils.anod
@@ -39,16 +39,6 @@ class Binutils(spec("common")):
             Anod.Dependency("isl", target="host"),
         ]
 
-        if self.env.is_canadian:
-            deps.append(
-                Anod.Dependency(
-                    name="gcc",
-                    host="build",
-                    target="host",
-                    local_name="canadian-cross-compiler",
-                )
-            )
-
         return deps
 
     def merge(self, prefix):

diff --git a/specs/gnatcoll-bindings.anod b/specs/gnatcoll-bindings.anod
@@ -31,7 +31,7 @@ class GNATcollBindings(spec("common")):
     @property
     def build_deps(self):
         deps = [
-            Anod.Dependency("gcc"),
+            Anod.Dependency("base_gcc"),
             Anod.Dependency("gprbuild"),
             Anod.Dependency("gnatcoll"),
             Anod.Dependency("libgpr"),

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/gnatcov.anod b/specs/gnatcov.anod
@@ -40,7 +40,7 @@ class GNATcov(spec("common")):
     @property
     def build_deps(self):
         deps = [
-            Anod.Dependency("gcc", track=True),
+            Anod.Dependency("base_gcc", track=True),
             Anod.Dependency("gprbuild", track=True),
             Anod.Dependency("libgpr", track=True),
             Anod.Dependency("gnatcoll", track=True),

diff --git a/specs/gnatutil.anod b/specs/gnatutil.anod
@@ -25,7 +25,7 @@ class GNATUTIL(spec("common")):
     @property
     def build_deps(self):
         return [
-            Anod.Dependency("gcc", track=True),
+            Anod.Dependency("base_gcc", track=True),
             Anod.Dependency("gprbuild", 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/langkit_support.anod b/specs/langkit_support.anod
@@ -30,7 +30,7 @@ class LangkikSupport(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("libgpr", track=True),
             Anod.Dependency("gnatcoll", track=True),

diff --git a/specs/libadalang.anod b/specs/libadalang.anod
@@ -30,7 +30,7 @@ class Langkit(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("libgpr", track=True),
             Anod.Dependency("gnatcoll", track=True),

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/libgpr2.anod b/specs/libgpr2.anod
@@ -49,7 +49,7 @@ class LibGPR2(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("libgpr", track=True),
             Anod.Dependency("xmlada", track=True),

diff --git a/specs/libiconv.anod b/specs/libiconv.anod
@@ -30,7 +30,7 @@ class LibIconv(spec("common")):
 
     @property
     def build_deps(self):
-        return [Anod.Dependency("gcc")]
+        return [Anod.Dependency("base_gcc")]
 
     def setenv(self):
         self.env.add_search_path(

diff --git a/specs/xmlada.anod b/specs/xmlada.anod
@@ -32,17 +32,7 @@ class XMLAda(spec("common")):
     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"))
+        deps.append(Anod.Dependency("base_gcc"))
 
         return deps
 

diff --git a/specs/zlib.anod b/specs/zlib.anod
@@ -39,7 +39,7 @@ class ZLib(spec("common")):
 
     @property
     def build_deps(self):
-        return [Anod.Dependency("gcc")]
+        return [Anod.Dependency("base_gcc")]
 
     def setenv(self):
         self.env.add_search_path(