Merge pull request #5736 from diffblue/OSX-Universal-arm64

Switch the OSX universal binary build to X86 + ARM64

Author: kroening

src/common

@@ -47,9 +47,9 @@ endif
 ifeq ($(filter-out OSX OSX_Universal,$(BUILD_ENV_)),)
   ifeq ($(BUILD_ENV_),OSX_Universal)
     # MacOS Fat Binaries
-    CP_CXXFLAGS += -force_cpusubtype_ALL -arch i386 -arch x86_64
-    CP_CFLAGS += -force_cpusubtype_ALL -arch i386 -arch x86_64
-    LINKFLAGS += -force_cpusubtype_ALL -arch i386 -arch x86_64
+    CP_CXXFLAGS += -force_cpusubtype_ALL -arch arm64 -arch x86_64
+    CP_CFLAGS += -force_cpusubtype_ALL -arch arm64 -arch x86_64
+    LINKFLAGS += -force_cpusubtype_ALL -arch arm64 -arch x86_64
   endif
   LINKLIB = /usr/bin/libtool -static -o $@ $^
   LINKBIN = $(CXX) $(LINKFLAGS) -o $@ $^ $(LIBS)