From 310330911acd9a706817f81e5ef64e7539f1f7b0 Mon Sep 17 00:00:00 2001
From: Sergey Fedorov <vital.had@gmail.com>
Date: Mon, 15 Apr 2024 20:42:01 +0800
Subject: [PATCH 10/13] configure: drop hardcoding of C++ runtime

---
 configure.ac         | 2 +-
 contrib/src/main.mak | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git configure.ac configure.ac
index ba9f1176b7..a9cd3c076d 100644
--- configure.ac
+++ configure.ac
@@ -165,8 +165,8 @@ case "${host_os}" in
     esac
 
     SYS=darwin
-    CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag}"
-    CXX="${CXX} -stdlib=libc++ -std=c++11"
+    CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 -Wno-error=incompatible-pointer-types ${ARCH_flag}"
+    CXX="${CXX} -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0"
     CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
     CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
     OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag}"
diff --git contrib/src/main.mak contrib/src/main.mak
index 2a7776caa1..56a15e664e 100644
--- contrib/src/main.mak
+++ contrib/src/main.mak
@@ -123,7 +123,6 @@ XCODE_FLAGS += OTHER_CFLAGS=-fno-stack-check
 endif
 
 ifdef HAVE_MACOSX
-EXTRA_CXXFLAGS += -stdlib=libc++
 ifeq ($(ARCH),aarch64)
 XCODE_FLAGS += -arch arm64
 else

+    CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 -Wno-error=incompatible-pointer-types ${ARCH_flag}"
+    CXX="${CXX} -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0"