From b5ca50ca2380a083f61fdf9b1ed05d89fa64a7c7 Mon Sep 17 00:00:00 2001
From: Andrew Leonard <anleonar@redhat.com>
Date: Wed, 5 Jun 2024 09:32:13 +0100
Subject: [PATCH 1/3] Explicitly set DevKit make bootstrap TOOLS

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
---
 pipelines/build/devkit/make_devkit.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pipelines/build/devkit/make_devkit.sh b/pipelines/build/devkit/make_devkit.sh
index d7672838e..2094f0ecf 100755
--- a/pipelines/build/devkit/make_devkit.sh
+++ b/pipelines/build/devkit/make_devkit.sh
@@ -65,17 +65,23 @@ cd make/devkit && pwd && make TARGETS=${devkit_target} BASE_OS=${BASE_OS} BASE_O
 
 # Move "bootstrap" devkit toolchain to a new folder and setup gcc toolchain to point at it
 cd ../..
-mv build/devkit/result/${devkit_target}-to-${devkit_target} build/bootstrap_${devkit_target}-to-${devkit_target}
-export CC=$(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}/bin/gcc
-export CXX=$(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}/bin/g++
-export LD_LIBRARY_PATH=$(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}/lib64
-export PATH=$(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}/bin:$PATH
-gcc --version
+BOOTSTRAP_DEVKIT="$(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}"
+mv build/devkit/result/${devkit_target}-to-${devkit_target} ${BOOTSTRAP_DEVKIT}
 
 # Make final "DevKit" using the bootstrap devkit
 rm -rf build/devkit
 echo "Building 'final' DevKit toolchain, using 'bootstrap' toolchain in $(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}"
-cd make/devkit && pwd && make TARGETS=${devkit_target} BASE_OS=${BASE_OS} BASE_OS_VERSION=${BASE_OS_VERSION}
+cd make/devkit && pwd && \
+  LD_LIBRARY_PATH="${BOOTSTRAP_DEVKIT}/lib64:${BOOTSTRAP_DEVKIT}/lib" \
+  PATH="${BOOTSTRAP_DEVKIT}/bin:$PATH" \
+  make TARGETS=${devkit_target} BASE_OS=${BASE_OS} BASE_OS_VERSION=${BASE_OS_VERSION} \
+       TOOLS="CC=${BOOTSTRAP_DEVKIT}/bin/gcc \
+              CXX=${BOOTSTRAP_DEVKIT}/bin/g++ \
+              LD=${BOOTSTRAP_DEVKIT}/bin/ld \
+              AR=${BOOTSTRAP_DEVKIT}/bin/ar \
+              AS=${BOOTSTRAP_DEVKIT}/bin/AS \
+              RANLIB=${BOOTSTRAP_DEVKIT}/bin/ranlib \
+              OBJDUMP=${BOOTSTRAP_DEVKIT}/bin/objdump"
 
 # Back to original folder
 cd ../../..

From 65a357c7e504eea98bfd01cc5eb36d92019115f7 Mon Sep 17 00:00:00 2001
From: Andrew Leonard <anleonar@redhat.com>
Date: Wed, 5 Jun 2024 10:25:25 +0100
Subject: [PATCH 2/3] Explicitly set DevKit make bootstrap TOOLS

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
---
 pipelines/build/devkit/make_devkit.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pipelines/build/devkit/make_devkit.sh b/pipelines/build/devkit/make_devkit.sh
index 2094f0ecf..e9fae95fb 100755
--- a/pipelines/build/devkit/make_devkit.sh
+++ b/pipelines/build/devkit/make_devkit.sh
@@ -75,13 +75,13 @@ cd make/devkit && pwd && \
   LD_LIBRARY_PATH="${BOOTSTRAP_DEVKIT}/lib64:${BOOTSTRAP_DEVKIT}/lib" \
   PATH="${BOOTSTRAP_DEVKIT}/bin:$PATH" \
   make TARGETS=${devkit_target} BASE_OS=${BASE_OS} BASE_OS_VERSION=${BASE_OS_VERSION} \
-       TOOLS="CC=${BOOTSTRAP_DEVKIT}/bin/gcc \
-              CXX=${BOOTSTRAP_DEVKIT}/bin/g++ \
-              LD=${BOOTSTRAP_DEVKIT}/bin/ld \
-              AR=${BOOTSTRAP_DEVKIT}/bin/ar \
-              AS=${BOOTSTRAP_DEVKIT}/bin/AS \
-              RANLIB=${BOOTSTRAP_DEVKIT}/bin/ranlib \
-              OBJDUMP=${BOOTSTRAP_DEVKIT}/bin/objdump"
+       CC=${BOOTSTRAP_DEVKIT}/bin/gcc \
+       CXX=${BOOTSTRAP_DEVKIT}/bin/g++ \
+       LD=${BOOTSTRAP_DEVKIT}/bin/ld \
+       AR=${BOOTSTRAP_DEVKIT}/bin/ar \
+       AS=${BOOTSTRAP_DEVKIT}/bin/AS \
+       RANLIB=${BOOTSTRAP_DEVKIT}/bin/ranlib \
+       OBJDUMP=${BOOTSTRAP_DEVKIT}/bin/objdump
 
 # Back to original folder
 cd ../../..

From 431267b9049b483c08eb8efb151f8fe098739fa2 Mon Sep 17 00:00:00 2001
From: Andrew Leonard <anleonar@redhat.com>
Date: Mon, 10 Jun 2024 16:09:15 +0100
Subject: [PATCH 3/3] Explicitly set DevKit make bootstrap TOOLS

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
---
 pipelines/build/devkit/make_devkit.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipelines/build/devkit/make_devkit.sh b/pipelines/build/devkit/make_devkit.sh
index e9fae95fb..5ca4e54f2 100755
--- a/pipelines/build/devkit/make_devkit.sh
+++ b/pipelines/build/devkit/make_devkit.sh
@@ -70,7 +70,7 @@ mv build/devkit/result/${devkit_target}-to-${devkit_target} ${BOOTSTRAP_DEVKIT}
 
 # Make final "DevKit" using the bootstrap devkit
 rm -rf build/devkit
-echo "Building 'final' DevKit toolchain, using 'bootstrap' toolchain in $(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}"
+echo "Building 'final' DevKit toolchain, using 'bootstrap' toolchain in ${BOOTSTRAP_DEVKIT}"
 cd make/devkit && pwd && \
   LD_LIBRARY_PATH="${BOOTSTRAP_DEVKIT}/lib64:${BOOTSTRAP_DEVKIT}/lib" \
   PATH="${BOOTSTRAP_DEVKIT}/bin:$PATH" \
@@ -79,7 +79,7 @@ cd make/devkit && pwd && \
        CXX=${BOOTSTRAP_DEVKIT}/bin/g++ \
        LD=${BOOTSTRAP_DEVKIT}/bin/ld \
        AR=${BOOTSTRAP_DEVKIT}/bin/ar \
-       AS=${BOOTSTRAP_DEVKIT}/bin/AS \
+       AS=${BOOTSTRAP_DEVKIT}/bin/as \
        RANLIB=${BOOTSTRAP_DEVKIT}/bin/ranlib \
        OBJDUMP=${BOOTSTRAP_DEVKIT}/bin/objdump