From 38bc7eab06b648371e33c1c8accfd1587655a79f Mon Sep 17 00:00:00 2001
From: Jaby <fenir50@web.de>
Date: Fri, 3 Jan 2025 10:16:57 +0100
Subject: [PATCH] Improve podman build

---
 podman/Dockerfile          |  3 ++-
 podman/scripts/make_gcc.sh | 14 ++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/podman/Dockerfile b/podman/Dockerfile
index 01641870..339c74b2 100644
--- a/podman/Dockerfile
+++ b/podman/Dockerfile
@@ -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
diff --git a/podman/scripts/make_gcc.sh b/podman/scripts/make_gcc.sh
index 18f31835..fc29bbb9 100755
--- a/podman/scripts/make_gcc.sh
+++ b/podman/scripts/make_gcc.sh
@@ -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,19 +49,17 @@ 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
 
 echo "<<< Delete GCC folder >>>"
 cd /usr
-rm -fr psx-gcc
-
-# TODO: Remove gcc files after everything 
\ No newline at end of file
+rm -fr psx-gcc
\ No newline at end of file