From 6e1bed03e58378b3c367daca25a775c69ba9d04d Mon Sep 17 00:00:00 2001
From: AliceLR <petrifiedrowan@gmail.com>
Date: Sat, 3 Feb 2024 20:03:24 -0700
Subject: [PATCH] Fix compilation when 'XCODE_3' is defined (no -stdlib).

---
 arch/darwin/Makefile.arch | 56 +++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/arch/darwin/Makefile.arch b/arch/darwin/Makefile.arch
index 176c3207d..7d58a9860 100644
--- a/arch/darwin/Makefile.arch
+++ b/arch/darwin/Makefile.arch
@@ -4,14 +4,11 @@
 
 ALL_ARCH        = arm64 arm64e i686 x86_64 x86_64h ppc ppc64
 
-CC              ?= clang
-CXX	        ?= clang++
-
 # Override these to match the compiler(s) being used.
-ifeq (${LEOPARD_SDK},1)
-ARM64_CFLAGS    ?= unsupported-architecture
-ARM64E_CFLAGS   ?= unsupported-architecture
-X86_64H_CFLAGS  ?= unsupported-architecture
+ifeq (${XCODE_3},1)
+ARM64_CC        ?= unsupported-architecture
+ARM64E_CC       ?= unsupported-architecture
+X86_64H_CC      ?= unsupported-architecture
 X86_CC          ?= i686-apple-darwin10-gcc-4.2.1
 X86_CXX         ?= i686-apple-darwin10-g++-4.2.1
 X86_64_CC       ?= ${X86_CC} -m64
@@ -20,6 +17,7 @@ PPC_CC          ?= powerpc-apple-darwin10-gcc-4.0.1
 PPC_CXX         ?= powerpc-apple-darwin10-g++-4.0.1
 PPC64_CC        ?= powerpc-apple-darwin10-gcc-4.2.1 -m64
 PPC64_CXX       ?= powerpc-apple-darwin10-g++-4.2.1 -m64
+STDLIB          ?=
 else
 ARM64_CFLAGS    ?= -arch arm64
 ARM64E_CFLAGS   ?= -arch arm64e
@@ -33,51 +31,51 @@ PPC64_CXX       ?= powerpc64-apple-darwin10-g++
 endif
 
 ifeq (${ARCH},arm64)
-CC       := $(or ${ARM64_CC},${CC}) ${ARM64_CFLAGS}
-CXX      := $(or ${ARM64_CXX},${CXX}) ${ARM64_CFLAGS}
-STDLIB   := libc++
-MINVER   ?= 11.0
+CC      := $(or ${ARM64_CC},${CC}) ${ARM64_CFLAGS}
+CXX     := $(or ${ARM64_CXX},${CXX}) ${ARM64_CFLAGS}
+STDLIB  ?= libc++
+MINVER  ?= 11.0
 endif
 
 ifeq (${ARCH},arm64e)
-CC       := $(or ${ARM64E_CC},${CC}) ${ARM64E_CFLAGS}
-CXX      := $(or ${ARM64E_CXX},${CXX}) ${ARM64E_CFLAGS}
-STDLIB   := libc++
-MINVER   ?= 11.0
+CC      := $(or ${ARM64E_CC},${CC}) ${ARM64E_CFLAGS}
+CXX     := $(or ${ARM64E_CXX},${CXX}) ${ARM64E_CFLAGS}
+STDLIB  ?= libc++
+MINVER  ?= 11.0
 endif
 
 ifeq (${ARCH},i686)
-CC       := $(or ${X86_CC},${CC}) ${X86_CFLAGS}
-CXX      := $(or ${X86_CXX},${CXX}) ${X86_CFLAGS}
-STDLIB   := libstdc++
-MINVER   ?= 10.6
+CC      := $(or ${X86_CC},${CC}) ${X86_CFLAGS}
+CXX     := $(or ${X86_CXX},${CXX}) ${X86_CFLAGS}
+STDLIB  ?= libstdc++
+MINVER  ?= 10.6
 endif
 
 ifeq (${ARCH},x86_64)
-CC       := $(or ${X86_64_CC},${CC}) ${X86_64_CFLAGS}
-CXX      := $(or ${X86_64_CXX},${CXX}) ${X86_64_CFLAGS}
-STDLIB   := libstdc++
-MINVER   ?= 10.6
+CC      := $(or ${X86_64_CC},${CC}) ${X86_64_CFLAGS}
+CXX     := $(or ${X86_64_CXX},${CXX}) ${X86_64_CFLAGS}
+STDLIB  ?= libstdc++
+MINVER  ?= 10.6
 endif
 
 ifeq (${ARCH},x86_64h)
-CC       := $(or ${X86_64H_CC},${CC}) ${X86_64H_CFLAGS}
-CXX      := $(or ${X86_64H_CXX},${CXX}) ${X86_64H_CFLAGS}
-STDLIB   := libc++
-MINVER   ?= 10.9
+CC      := $(or ${X86_64H_CC},${CC}) ${X86_64H_CFLAGS}
+CXX     := $(or ${X86_64H_CXX},${CXX}) ${X86_64H_CFLAGS}
+STDLIB  ?= libc++
+MINVER  ?= 10.9
 endif
 
 ifeq (${ARCH},ppc)
 CC      := $(or ${PPC_CC},${CC}) ${PPC_CFLAGS}
 CXX     := $(or ${PPC_CXX},${CXX}) ${PPC_CFLAGS}
-STDLIB  := libstdc++
+STDLIB  ?= libstdc++
 MINVER  ?= 10.4
 endif
 
 ifeq (${ARCH},ppc64)
 CC      := $(or ${PPC64_CC},${CC}) ${PPC64_CFLAGS}
 CXX     := $(or ${PPC64_CXX},${CXX}) ${PPC64_CFLAGS}
-STDLIB  := libstdc++
+STDLIB  ?= libstdc++
 MINVER  ?= 10.4
 endif