Improve podman build

This commit is contained in:
jaby 2025-01-03 10:16:57 +01:00
parent 80a49a7e92
commit df3b5cd334
2 changed files with 8 additions and 9 deletions

View File

@ -1,6 +1,7 @@
FROM "ubuntu:24.04"
WORKDIR /usr
WORKDIR /usr/scripts
ADD ["scripts/make_gcc.sh", "/usr/scripts"]
WORKDIR /usr
RUN apt update && /usr/scripts/make_gcc.sh
WORKDIR /usr/scripts

View File

@ -21,12 +21,12 @@ if [ $? -ne 0 ]; then
exit 1
fi
echo "<<< Make binutils >>>"
make
make -j$(nproc)
if [ $? -ne 0 ]; then
exit 1
fi
echo "<<< Install binutils >>>"
make install
make -j$(nproc) install
if [ $? -ne 0 ]; then
exit 1
fi
@ -38,7 +38,7 @@ git clone --recurse-submodules git://gcc.gnu.org/git/gcc.git
cd gcc
echo "<<< checkout gcc $GCC_VERSION >>>"
git checkout releases/$GCC_VERSION
git checkout "releases/gcc-$GCC_VERSION"
mkdir -p build
cd build
@ -49,13 +49,13 @@ if [ $? -ne 0 ]; then
fi
echo "<<< Make gcc >>>"
make all-gcc
make -j$(nproc) all-gcc
if [ $? -ne 0 ]; then
exit 1
fi
echo "<<< Install gcc >>>"
make install-gcc
make -j$(nproc) install-gcc
if [ $? -ne 0 ]; then
exit 1
fi
@ -63,5 +63,3 @@ fi
echo "<<< Delete GCC folder >>>"
cd /usr
rm -fr psx-gcc
# TODO: Remove gcc files after everything