From fc1586262187d01710ddc3db7608ea1c97c3aa00 Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Mon, 27 Jun 2022 20:57:55 +0200
Subject: [PATCH] Some improvements to Linux build scripts.

---
 Makefile                    | 16 ++++++++--------
 deps/build-openssl-linux.sh |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 83e6db8..a7a6376 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := bash
 # FLAGS
 # ---------------------------------------------------------------------------
 
-MACHINE := $(shell gcc -dumpmachine)
+MACHINE := $(shell $(CC) -dumpmachine)
 ifeq ($(MACHINE),$(filter x86_64-%,$(MACHINE)))
   MYCPU := x64
   MARCH := x86-64
@@ -43,14 +43,14 @@ endif
 all: keygen sign verify
 
 keygen: subdirs src/.magic.h rsrc
-	gcc $(CFLAGS) $(LDFLAGS) -o bin/codesign_keygen$(SUFFIX) src/codesign_keygen.c src/common.c obj/version_keygen.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/codesign_keygen$(SUFFIX) src/codesign_keygen.c src/common.c obj/version_keygen.o $(LIBS)
 
 sign: subdirs src/.magic.h
-	gcc $(CFLAGS) $(LDFLAGS) -o bin/codesign_sign$(SUFFIX) src/codesign_sign.c src/common.c obj/version_sign.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/codesign_sign$(SUFFIX) src/codesign_sign.c src/common.c obj/version_sign.o $(LIBS)
 
 verify: subdirs src/.magic.h rsrc
-	gcc $(CFLAGS) -UEMBED_PUBKEY $(LDFLAGS) -o bin/codesign_verify$(SUFFIX) src/codesign_verify.c src/common.c obj/version_verify.o $(LIBS)
-	gcc $(CFLAGS) -DEMBED_PUBKEY $(LDFLAGS) -o bin/codesign_verifz$(SUFFIX) src/codesign_verify.c src/common.c obj/version_verify.o $(LIBS)
+	$(CC) $(CFLAGS) -UEMBED_PUBKEY $(LDFLAGS) -o bin/codesign_verify$(SUFFIX) src/codesign_verify.c src/common.c obj/version_verify.o $(LIBS)
+	$(CC) $(CFLAGS) -DEMBED_PUBKEY $(LDFLAGS) -o bin/codesign_verifz$(SUFFIX) src/codesign_verify.c src/common.c obj/version_verify.o $(LIBS)
 
 src/.magic.h:
 	str=$$(tr -dc '0-9A-F' < /dev/urandom | head -c 26); \
@@ -67,9 +67,9 @@ ifeq ($(MACHINE),$(filter %-mingw32,$(MACHINE)))
 	windres -DAPP="Signer ($(MYCPU))" -DNAME=sign -o obj/version_sign.o res/version.rc
 	windres -DAPP="Verifier ($(MYCPU))" -DNAME=verify -o obj/version_verify.o res/version.rc
 else
-	gcc -o obj/version_keygen.o -xc -c - < /dev/null
-	gcc -o obj/version_sign.o -xc -c - < /dev/null
-	gcc -o obj/version_verify.o -xc -c - < /dev/null
+	$(CC) -o obj/version_keygen.o -xc -c - < /dev/null
+	$(CC) -o obj/version_sign.o -xc -c - < /dev/null
+	$(CC) -o obj/version_verify.o -xc -c - < /dev/null
 endif
 
 subdirs: deps/$(MYCPU)/lib/libcrypto.a deps/$(MYCPU)/lib/libssl.a
diff --git a/deps/build-openssl-linux.sh b/deps/build-openssl-linux.sh
index 84ee50a..08d63f6 100755
--- a/deps/build-openssl-linux.sh
+++ b/deps/build-openssl-linux.sh
@@ -6,7 +6,7 @@ trap 'read -p "Press any key..." x' EXIT
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Set up compiler
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-case "$(cc -dumpmachine)" in
+case "$(${CC:-cc} -dumpmachine)" in
   i686-*)
     readonly MY_CPU=x86
     readonly MY_MARCH=i486