Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try GitHub large custom runners #59

Closed
wants to merge 2 commits into from
Closed

Try GitHub large custom runners #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd877cc
Try GitHub large custom runners
Fabien-Chouteau Nov 30, 2023
bac8d99
gcc.specs: use --disable-bootstrap to speed up GCC builds
Fabien-Chouteau Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
gnat_gprbuild:
name: GNAT Linux and GPRbuild
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04-64cores
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
gnatcov:
name: GNATcov
needs: gnat_gprbuild
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04-64cores
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
target: ["arm-elf", "riscv64-elf", "avr-elf"]
name: GNAT ${{ matrix.target }}-linux
needs: gnat_gprbuild
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04-64cores
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
spark:
name: spark
needs: [why3, alt_ergo]
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04-64cores
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
gnat_gprbuild:
name: GNAT Windows and gprbuild
runs-on: windows-2019
runs-on: windows-2019-64cores
env:
CONFIG_SHELL: /bin/bash
defaults:
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
gnatcov:
name: GNATcov
needs: gnat_gprbuild
runs-on: windows-2019
runs-on: windows-2019-64cores
env:
CONFIG_SHELL: /bin/bash
defaults:
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
target: ["arm-elf", "riscv64-elf", "avr-elf"]
name: GNAT ${{ matrix.target }}-windows
needs: gnat_gprbuild
runs-on: windows-2019
runs-on: windows-2019-64cores
env:
CONFIG_SHELL: /bin/bash
defaults:
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
matrix:
ocaml-compiler:
- 4.11.2
runs-on: windows-2019
runs-on: windows-2019-64cores
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down Expand Up @@ -259,7 +259,7 @@ jobs:
spark:
name: spark
needs: [why3, alt_ergo]
runs-on: windows-2019
runs-on: windows-2019-64cores
env:
CONFIG_SHELL: /bin/bash
defaults:
Expand Down
22 changes: 12 additions & 10 deletions specs/gcc.anod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from e3.os.fs import unixpath
from e3.os.fs import unixpath, cd
from e3.fs import cp, mkdir, sync_tree
from e3.anod.helper import Configure, Make
from e3.anod.spec import Anod
Expand Down Expand Up @@ -81,9 +81,6 @@ class GCC(spec("gh-artifact")):
else:
deps.append(Anod.Dependency("base_gcc", host="build", target="host"))

if self.env.build.os.name != "darwin":
deps.append(Anod.Dependency("isl", host="build", target="host"))

if self.env.target.os.name != "darwin":
deps.append(Anod.Dependency("binutils", target="target"))

Expand Down Expand Up @@ -190,6 +187,10 @@ class GCC(spec("gh-artifact")):
"lib", "gcc", self.env.target.triplet, self.version
)

cd(self["SRC_DIR"])
self.shell(os.path.join(self['SRC_DIR'], 'contrib', 'download_prerequisites'))
cd(self["BUILD_DIR"])

if self.env.target.os.name == "windows":
# Deploy the mingw dependency in the ./mingw64 directory
self.deps["mingw"].merge(os.path.join(self["SRC_DIR"], "mingw64"))
Expand Down Expand Up @@ -217,6 +218,13 @@ class GCC(spec("gh-artifact")):
configure = Configure(self)
configure.add("--prefix=%s" % unixpath(self["INSTALL_DIR"]))


# For a native build, the default configuration is to perform a 3-stage
# bootstrap of the compiler when "make" is invoked, testing that GCC
# can compile itself correctly. If you want to disable this process,
# you can configure with --disable-bootstrap.
configure.add("--disable-bootstrab")

if "binutils" in self.deps:
configure.add(
"--with-build-time-tools=%s"
Expand All @@ -238,12 +246,6 @@ class GCC(spec("gh-artifact")):
for a in self.configure_args():
configure.add(a)

for m in ("mpfr", "gmp", "mpc", "isl"):
if m in self.deps:
configure.add(
"--with-%s=%s" % (m, unixpath(self.deps[m]["INSTALL_DIR"]))
)

if self.env.host.os.name == "windows":
# https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=902c755930326cb4405672aa3ea13c35c653cbff
os.environ["CPPFLAGS"] = "-DCOM_NO_WINDOWS_H"
Expand Down
Loading