User: Drop ia32 support. Support universal binaries for utilities

User/Makefile

@@ -80,13 +80,8 @@ endif
 
 ifeq ($(DIST),Darwin)
 	ifneq ($(FUZZ),1)
-		ifeq ($(UDK_ARCH),Ia32)
-			CFLAGS  += -mmacosx-version-min=10.6 --target=i386-apple-darwin
-			LDFLAGS += -mmacosx-version-min=10.6 --target=i386-apple-darwin
-		else
-			CFLAGS  += -mmacosx-version-min=10.6 --target=x86_64-apple-darwin
-			LDFLAGS += -mmacosx-version-min=10.6 --target=x86_64-apple-darwin
-		endif
+		CFLAGS  += -mmacosx-version-min=10.9 -arch x86_64 -arch arm64
+		LDFLAGS += -mmacosx-version-min=10.9 -arch x86_64 -arch arm64
 	endif
 endif
 

Utilities/BaseTools/Makefile

@@ -5,7 +5,7 @@ RM ?= /bin/rm
 DIST ?= $(shell uname)
 
 ifeq ($(DIST),Darwin)
-	CFLAGS+=-mmacosx-version-min=10.6
+	CFLAGS += -arch x86_64 -arch arm64 -mmacosx-version-min=10.9
 endif
 
 BINDIR=bin.$(DIST)

Utilities/RsaTool/Makefile

@@ -16,6 +16,14 @@ libressl/lib/libcrypto.a:
 $(OUT_DIR)/$(PROJECT).o: libressl/lib/libcrypto.a
 endif
 
-CFLAGS  += -Ilibressl/include -I/usr/local/opt/openssl/include -I/opt/local/include -Wno-deprecated-declarations
-LDFLAGS += -Llibressl/lib -L/usr/local/opt/openssl/lib -L/opt/local/lib
+ifeq ($(DIST),Darwin)
+ifeq ($(shell uname -p),arm)
+OPENSSL_PATH = /opt/homebrew/opt/openssl
+else
+OPENSSL_PATH = /usr/local/opt/openssl
+endif
+endif
+
+CFLAGS  += -Ilibressl/include -I$(OPENSSL_PATH)/include -I/opt/local/include -Wno-deprecated-declarations
+LDFLAGS += -Llibressl/lib -L$(OPENSSL_PATH)/lib -L/opt/local/lib
 LDLIBS  += -lcrypto

Utilities/RsaTool/build_libressl.sh

@@ -11,8 +11,8 @@ cd "$SRC_DIR" || exit 1
 OUTPUT_PATH="$(pwd)/libressl"
 BUILD_DIR="$(pwd)/tmp/${LIBRESSL_NAME}/build"
 
-export CFLAGS="-mmacosx-version-min=10.6 -Wno-unguarded-availability-new"
-export LDFLAGS="-mmacosx-version-min=10.6"
+export CFLAGS="-arch x86_64 -arch arm64 -mmacosx-version-min=10.9 -Wno-unguarded-availability-new"
+export LDFLAGS="-arch x86_64 -arch arm64 -mmacosx-version-min=10.9"
 
 abort() {
   echo "ERROR: $1!"
@@ -69,14 +69,7 @@ echo "Downloading LibreSSL ${LIBRESSL_VERSION}..."
 
 cd "${LIBRESSL_NAME}" || abort "Failed to cd to ${LIBRESSL_NAME} with code $?"
 
-if [ "$(${ARCH})" = "arm64" ]; then
-  # If we are building on arm64 (Apple Silicon), these extra options are required to ensure x86_64 builds.
-  EXTRA_OPTS=(--host=arm-apple-darwin --build=x86_64-apple-darwin)
-  CFLAGS+=" --target=x86_64-apple-darwin"
-  LDFLAGS+=" --target=x86_64-apple-darwin"
-else
-  EXTRA_OPTS=()
-fi
+EXTRA_OPTS=()
 
 # Monkeypatch to disable strtonum for <11.0 support
 "${SED}" -i '' -E 's/strsep strtonum/strsep/g' configure || abort "Failed to monkeypatch strtonum in LibreSSL with code $?"