From 187475826e496ad1733fd62060974f2e9dc22099 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Tue, 13 Dec 2022 02:55:25 +0400
Subject: [PATCH] Use programs more consistently (#141)

---
 .github/workflows/main.yml | 4 ++--
 README.md                  | 7 ++++---
 configure.ac               | 4 +---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1745f6c..2962234 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -76,7 +76,7 @@ jobs:
       - name: autogen
         run: ./autogen.sh
       - name: configure
-        run: ./configure --host='${{matrix.cross.arch}}-unknown-elf' --enable-checks --enable-checks-pthreads --enable-checks-python AR='${{matrix.cross.cprefix}}ar' CC='${{matrix.cross.cprefix}}gcc' LD='${{matrix.cross.cprefix}}ld' RANLIB='${{matrix.cross.cprefix}}ranlib'
+        run: ./configure --host='${{matrix.cross.arch}}-unknown-elf' --enable-checks --enable-checks-pthreads --enable-checks-python CC='${{matrix.cross.cprefix}}gcc'
       - name: make
         run: make
       - name: check
@@ -121,7 +121,7 @@ jobs:
       - name: autogen
         run: ./autogen.sh
       - name: configure
-        run: ./configure --host='i386-elf' ${{matrix.debug}} --enable-freestanding --with-libc AR="$(which i686-linux-gnu-ar)" CC="$(which i686-linux-gnu-gcc)" LD="$(which i686-linux-gnu-ld)" RANLIB="$(which i686-linux-gnu-ranlib)"
+        run: ./configure --host='i386-elf' ${{matrix.debug}} --enable-freestanding --with-libc CC="$(which i686-linux-gnu-gcc)"
       - name: make
         run: make
 
diff --git a/README.md b/README.md
index 4161746..508c649 100644
--- a/README.md
+++ b/README.md
@@ -212,11 +212,12 @@ without it in `$PATH`:
   --host='i386-elf' \
   --enable-freestanding \
   --with-libc \
-  AR="$(which i386-elf-ar)" \
-  CC="$(which i386-elf-gcc)" \
-  RANLIB="$(which i386-elf-ranlib)"
+  CC="$(which i386-elf-gcc)"
 ```
 
+The variables include `AR`, `AS`, `CC`, `CCAS`, `LD`, `NM`, `OBJDUMP`, `RANLIB`,
+`STRIP`. See the generated `config.log` for more information.
+
 To install into specific directory use full path: `DESTDIR="$(pwd)/dest" make
 install` instead of `DESTDIR=dest make install`.
 
diff --git a/configure.ac b/configure.ac
index 393838e..ff4a35c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,10 +319,8 @@ AS_IF([test "$enable_freestanding" = yes],
 ##############
 
 AC_LANG([C])
-
-AM_PROG_AR
 AM_PROG_AS
-AC_PROG_CC
+
 AC_C_INLINE
 
 AC_HEADER_STDBOOL