From 59b04ac5e94f5eeb4ae404031693fd1b146abeb5 Mon Sep 17 00:00:00 2001 From: Fabien Chouteau Date: Tue, 8 Nov 2022 14:57:56 +0100 Subject: [PATCH] Change dependencies to build gprbuild, gnatcoll and Ada libraries using the base compiler --- specs/binutils.anod | 10 ---------- specs/gnatcoll-bindings.anod | 2 +- specs/gnatcoll.anod | 2 +- specs/gnatcov.anod | 2 +- specs/gnatutil.anod | 2 +- specs/gprbuild.anod | 6 +++--- specs/langkit_support.anod | 2 +- specs/libadalang.anod | 2 +- specs/libgpr.anod | 2 +- specs/libgpr2.anod | 2 +- specs/libiconv.anod | 2 +- specs/xmlada.anod | 12 +----------- specs/zlib.anod | 2 +- 13 files changed, 14 insertions(+), 34 deletions(-) diff --git a/specs/binutils.anod b/specs/binutils.anod index 201ceba..fa09672 100644 --- 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 index c9c7b15..350d437 100644 --- 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 index 634f8de..ce8e617 100644 --- 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 index 5a32f43..d52e44f 100644 --- 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 index 087d5ad..031d788 100644 --- 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 index 244156a..1ec2d51 100644 --- 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 index 46c5d51..11962b8 100644 --- 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 index 3fc8d82..0b8b684 100644 --- 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 index c51f863..ad65df1 100644 --- 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 index e8cc240..0ad57d2 100644 --- 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 index b43cfa7..39e4d74 100644 --- 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 index cc7994a..f28cfcb 100644 --- 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 index d6e3bce..46fe557 100644 --- 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(