--- src/build-data/cc/clang.txt.orig	2022-06-03 12:29:40.000000000 -0500
+++ src/build-data/cc/clang.txt	2022-10-29 02:06:49.000000000 -0500
@@ -76,9 +76,10 @@
 
 openmp  -> "-fopenmp"
 
-x86_32  -> "-m32"
-x86_64  -> "-m64"
-ppc64   -> "-m64"
+x86_32  -> "-arch i386"
+x86_64  -> "-arch x86_64"
+ppc32   -> "-arch ppc"
+ppc64   -> "-arch ppc64"
 
-macos   -> "-stdlib=libc++"
+macos   -> "-stdlib=__MACPORTS_CXX_STDLIB__"
 ios     -> "-stdlib=libc++"
 netbsd  -> "-D_NETBSD_SOURCE"
 </mach_abi_linking>
--- src/build-data/cc/gcc.txt.orig	2022-06-03 12:29:40.000000000 -0500
+++ src/build-data/cc/gcc.txt	2022-10-29 02:06:49.000000000 -0500
@@ -89,9 +89,10 @@
 s390x   -> "-m64"
 sparc32 -> "-m32 -mno-app-regs"
 sparc64 -> "-m64 -mno-app-regs"
-ppc64   -> "-m64"
-x86_32  -> "-m32"
-x86_64  -> "-m64"
+ppc32   -> "-arch ppc"
+ppc64   -> "-arch ppc64"
+x86_32  -> "-arch i386"
+x86_64  -> "-arch x86_64"
 x32     -> "-mx32"
 
 qnx     -> "-fexceptions"