From 1581b740275bd081f4f43db76fbadf4813aad35c Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Thu, 22 Jun 2023 10:57:14 +0100
Subject: [PATCH] Update everything to reference the simpler tool autodetection

---
 .github/workflows/tests.yml  | 7 -------
 doc/Building.md              | 4 +---
 scripts/hack_fakeautoconf.sh | 1 +
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a2d48ba..769b8b9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -386,8 +386,6 @@ jobs:
         run: |
           # This will warn about CC, but we cannot set CC until we run it :-S
           HOST_TRIPLET=$(dpkg-architecture -a${{ matrix.arch }} -q DEB_HOST_GNU_TYPE)
-          export CC=$HOST_TRIPLET-gcc
-          export AR=$HOST_TRIPLET-ar
           ./autogen.sh
           ./configure --host $HOST_TRIPLET
           cd packages/debian/
@@ -598,7 +596,6 @@ jobs:
           # this is a hack! it assumes the default SDK is the 'right' one
           export SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
           ./autogen.sh
-          export CC=clang
           export CFLAGS="-target ${{ matrix.arch }}"
           export LDFLAGS="-target ${{ matrix.arch }}"
           ./configure --host=${{ matrix.arch }}
@@ -647,7 +644,6 @@ jobs:
           # this is a hack! it assumes the default SDK is the 'right' one
           export SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
           ./autogen.sh
-          export CC=clang
           export CFLAGS="-arch x86_64 -arch arm64"
           export LDFLAGS="-arch x86_64 -arch arm64"
           ./configure
@@ -703,9 +699,6 @@ jobs:
         shell: bash
         run: |
           ./autogen.sh
-          export CC=${{ matrix.arch }}-gcc
-          export AR=${{ matrix.arch }}-ar
-          export WINDRES=${{ matrix.arch }}-windres
           ./configure --host ${{ matrix.arch }}
           make
 
diff --git a/doc/Building.md b/doc/Building.md
index 3543366..4882c6e 100644
--- a/doc/Building.md
+++ b/doc/Building.md
@@ -103,7 +103,7 @@ See `edge.exe --help` and `supernode.exe --help` for a full list of supported op
 The Makefiles are all setup to allow cross compiling of this code.  You
 will need to have the cross compiler, binutils and any additional libraries
 desired installed for the target architecture.  Then you can run the `./configure`
-with the appropriate CC and AR environment and the right `--host` option.
+with the appropriate `--host` option.
 
 If compiling on Debian or Ubuntu, this can be as simple as the following example:
 
@@ -111,8 +111,6 @@ If compiling on Debian or Ubuntu, this can be as simple as the following example
 HOST_TRIPLET=arm-linux-gnueabi
 sudo apt-get install binutils-$HOST_TRIPLET gcc-$HOST_TRIPLET
 ./autogen.sh
-export CC=$HOST_TRIPLET-gcc
-export AR=$HOST_TRIPLET-ar
 ./configure --host $HOST_TRIPLET
 make
 ```
diff --git a/scripts/hack_fakeautoconf.sh b/scripts/hack_fakeautoconf.sh
index 0165f2e..8247b70 100755
--- a/scripts/hack_fakeautoconf.sh
+++ b/scripts/hack_fakeautoconf.sh
@@ -6,6 +6,7 @@
 cat >config.mak <<EOF
 CC=gcc
 AR=ar
+WINDRES=windres
 CFLAGS=$CFLAGS -g -O2 -I./include
 LDFLAGS=$LDFLAGS -L.
 LDLIBS_EXTRA=$LDLIBS