feat: remove toolchain.sh

Signed-off-by: Martin Kröning <[email protected]>

Dockerfile

@@ -22,6 +22,8 @@ RUN set -eux; \
     rm -rf /var/lib/apt/lists/*;
 ADD --link https://github.com/hermit-os/binutils.git /binutils
 WORKDIR /binutils
+ENV CFLAGS="-w" \
+    CXXFLAGS="-w"
 ARG TARGET
 ARG PREFIX
 RUN set -eux; \
@@ -43,8 +45,7 @@ RUN set -eux; \
     make -O -j$(nproc); \
     make install
 
-FROM buildpack-deps:bookworm AS builder
-
+FROM buildpack-deps:bookworm AS gcc
 RUN set -eux; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
@@ -57,23 +58,88 @@ RUN set -eux; \
         texinfo \
     ; \
     rm -rf /var/lib/apt/lists/*;
-
-WORKDIR /root
-
+ARG TARGET
 ARG PREFIX
-COPY --link --from=kernel /kernel/libhermit.a ./kernel/libhermit.a
 COPY --link --from=binutils ${PREFIX} ${PREFIX}
-ADD --link https://github.com/hermit-os/gcc.git gcc
-ADD --link https://github.com/hermit-os/newlib.git newlib
-ADD --link https://github.com/hermit-os/pthread-embedded.git pte
-ADD --link ./toolchain.sh ./toolchain.sh
+ENV CFLAGS="-w" \
+    CXXFLAGS="-w" \
+    CFLAGS_FOR_TARGET="-fPIE -pie" \
+    GOFLAGS_FOR_TARGET="-fPIE -pie" \
+    FCFLAGS_FOR_TARGET="-fPIE -pie" \
+    FFLAGS_FOR_TARGET="-fPIE -pie" \
+    CXXFLAGS_FOR_TARGET="-fPIE -pie"
 
-ARG TARGET
-RUN ./toolchain.sh ${TARGET} ${PREFIX}
+ADD --link https://github.com/hermit-os/gcc.git /gcc
+WORKDIR /gcc/builddir-bootstrap
+RUN set -eux; \
+    ../configure \
+        --target=${TARGET} \
+        --prefix=${PREFIX} \
+        --without-headers \
+        --disable-multilib \
+        --with-isl \
+        --enable-languages=c,c++,lto \
+        --disable-nls \
+        --disable-shared \
+        --disable-libssp \
+        --disable-libgomp \
+        --enable-threads=posix \
+        --enable-tls \
+        --enable-lto \
+        --disable-symvers; \
+    make -O -j$(nproc) all-gcc; \
+    make install-gcc
+ENV PATH=${PREFIX}/bin:$PATH
 
+COPY --link --from=kernel /kernel/libhermit.a /gcc/builddir-bootstrap/libhermit.a
+ENV LDFLAGS_FOR_TARGET=-L/gcc/builddir-bootstrap
+
+ADD --link https://github.com/hermit-os/newlib.git /newlib
+WORKDIR /newlib
+RUN set -eux; \
+    ./configure \
+        --target=${TARGET} \
+        --prefix=${PREFIX} \
+        --disable-shared \
+        --disable-multilib \
+        --enable-lto \
+        --enable-newlib-io-c99-formats \
+        --enable-newlib-multithread; \
+    make -O -j$(nproc); \
+    make install
+
+ADD --link https://github.com/hermit-os/pthread-embedded.git /pthread-embedded
+WORKDIR /pthread-embedded
+RUN set -eux; \
+    ./configure \
+        --target=$TARGET \
+        --prefix=$PREFIX; \
+    make -O -j$(nproc); \
+    make install
+
+WORKDIR /gcc/builddir
+RUN set -eux; \
+    ../configure \
+        --target=$TARGET \
+        --prefix=$PREFIX \
+        --with-newlib \
+        --with-isl \
+        --disable-multilib \
+        --without-libatomic \
+        --enable-languages=c,c++,fortran,lto \
+        --disable-nls \
+        --disable-shared \
+        --enable-libssp \
+        --enable-threads=posix \
+        --enable-libgomp \
+        --enable-tls \
+        --enable-lto \
+        --disable-symver; \
+    make -O -j$(nproc); \
+    make install
 
 FROM rust:bookworm AS toolchain
 ARG PREFIX
-COPY --from=builder ${PREFIX} ${PREFIX}
+COPY --from=gcc ${PREFIX} ${PREFIX}
 ENV PATH=${PREFIX}/bin:$PATH \
     LD_LIBRARY_PATH=${PREFIX}/lib:$LD_LIBRARY_PATH

README.md

@@ -1,30 +1,22 @@
-# hermit-toolchain
+# hermit-gcc
 
-This repository contains scripts to build the cross-compiler for the Rust-based library OS [HermitCore](https://github.com/hermit-os/libhermit-rs).
+This repository contains a [`Dockerfile`] to build the GCC cross-compiler for [the Hermit Operating System].
 
-## Requirements
+[`Dockerfile`]: Dockerfile
+[the Hermit Operating System]: http://hermit-os.org
 
-The build process works currently only on **x86-based Linux** systems. The following software packets are required to build HermitCore's toolchain on a Linux system:
+## Usage
 
-* Netwide Assembler (NASM)
-* GNU Make, GNU Binutils, cmake
-* Tools and libraries to build *linux*, *binutils* and *gcc* (e.g. flex, bison, MPFR library, GMP library, MPC library)
-* Rust
+You can use the prebuilt [hermit-toolchain] OCI image to run `x86_64-hermit-gcc`:
 
-On Debian-based systems the packets can be installed by executing:
-```
-  sudo apt-get install cmake nasm libmpfr-dev libmpc-dev libgmp-dev flex bison
-```
-
-Note: If issues arise during the build, try using requirements.sh to check the versions of the necessary packets and the configuration of the LD_LIBRARY_PATH (it should contain the MPFR library, GMP library and MPC library).
+[`hermit-toolchain`]: https://github.com/hermit-os/hermit-gcc/pkgs/container/hermit-toolchain
 
-## Building the HermitCore's toolchain
+```bash
+docker run ghcr.io/hermit-os/hermit-toolchain:latest x86_64-hermit-gcc -v
+```
 
-To build the toolchain just call the script as follow:
+You can also use the image interactively and mount your current directory:
 
 ```bash
-$ ./toolchain.sh x86_64-hermit /home/usr/hermit
+docker run --rm -it -v .:/mnt -w /mnt ghcr.io/hermit-os/hermit-toolchain:latest
 ```
-
-The first argument of the script specifies the target architecture, where the second argument defines the path to the installation directory.
-To create the toolchain, write access to the installation directory is required.