From 8bd31cf29c09d64947053438e8507ced00312d18 Mon Sep 17 00:00:00 2001
From: Thorsten Otto <admin@tho-otto.de>
Date: Tue, 30 Apr 2024 09:36:33 +0200
Subject: [PATCH] Add support for mintelf toolchains

---
 .github/workflows/build.yml  | 3 ++-
 .scripts/build.sh            | 3 +--
 .scripts/deploy.sh           | 4 ----
 .scripts/install-freemint.sh | 2 +-
 .scripts/setup_env.sh        | 5 ++---
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index de555c7..124036b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,8 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
-        cross_tool: [ "m68k-atari-mint" ]
+        cross_tool: [ "m68k-atari-mint", "m68k-atari-mintelf" ]
     steps:
       - uses: actions/checkout@v4
       - name: Install SSH keys
diff --git a/.scripts/build.sh b/.scripts/build.sh
index 8d0a694..2688644 100755
--- a/.scripts/build.sh
+++ b/.scripts/build.sh
@@ -5,9 +5,8 @@
 
 export ACLOCAL=aclocal
 export AUTOMAKE=automake
-CROSS_TOOL=${CROSS_TOOL:-m68k-atari-mint}
 # wrong: we need the cross-compiler version here
-# CC=${CROSS_TOOL}-gcc RANLIB=m68k-atari-mint-ranlib ./configure --prefix=/usr --disable-nls --host=${CROSS_TOOL} --target=${CROSS_TOOL} && make
+# CC=${CROSS_TOOL}-gcc RANLIB=${CROSS_TOOL}-ranlib ./configure --prefix=/usr --disable-nls --host=${CROSS_TOOL} --target=${CROSS_TOOL} && make
 
 CC=gcc ./configure --prefix=/usr --disable-nls --target=${CROSS_TOOL}
 
diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh
index b1f26b5..53086da 100755
--- a/.scripts/deploy.sh
+++ b/.scripts/deploy.sh
@@ -73,10 +73,6 @@ upload_file "$ARCHIVE_PATH" "${UPLOAD_DIR}/${PROJECT_DIR}/${ARCHIVE_NAME}"
 if test -z "${CPU_TARGET}"
 then
 	link_file "$ARCHIVE_NAME" "${PROJECT_DIR}-${toolsuffix}-latest.${DEPLOY_ARCHIVE}"
-	# traditionally, that link did not contain the cross toolchain suffix
-	if test "$toolsuffix" = "mint"; then
-		link_file "$ARCHIVE_NAME" "${PROJECT_DIR}-latest.${DEPLOY_ARCHIVE}"
-	fi
 fi
 
 echo ${PROJECT_NAME}-${PROJECT_VERSION}-${SHORT_ID} > .latest_version
diff --git a/.scripts/install-freemint.sh b/.scripts/install-freemint.sh
index 6a7d8ce..8a32e4d 100755
--- a/.scripts/install-freemint.sh
+++ b/.scripts/install-freemint.sh
@@ -9,7 +9,7 @@ exit 0
 
 DOWNLOAD_DIR=http://tho-otto.de/snapshots
 CROSS_TOOL=${CROSS_TOOL:-m68k-atari-mint}
-SYSROOT_DIR=${SYSROOT_DIR:-"/usr/$CROSS_TOOL/sys-root/usr"}
+SYSROOT_DIR=${SYSROOT_DIR:-"/usr/$CROSS_TOOL/sys-root"}
 
 sudo mkdir -p "${SYSROOT_DIR}" && cd "${SYSROOT_DIR}"
 
diff --git a/.scripts/setup_env.sh b/.scripts/setup_env.sh
index 22cc9bd..b6b9af3 100755
--- a/.scripts/setup_env.sh
+++ b/.scripts/setup_env.sh
@@ -23,9 +23,8 @@ BRANCH=$(echo "${GITHUB_REF}" | cut -d '/' -f 3)
 if test "$CPU_TARGET" != ""; then
 	echo "CPU_TARGET=$CPU_TARGET" >> $GITHUB_ENV
 fi
-if test "$CROSS_TOOL" != ""; then
-	echo "CROSS_TOOL=$CROSS_TOOL" >> $GITHUB_ENV
-fi
+CROSS_TOOL=${CROSS_TOOL:-m68k-atari-mint}
+echo "CROSS_TOOL=$CROSS_TOOL" >> $GITHUB_ENV
 
 # GITHUB_HEAD_REF is only set for pull requests
 if [ "${GITHUB_HEAD_REF}" = "" ]