From 8cfd9bc3fcad65a9e8720f3fb2ea0a0a0794bd2b Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Mon, 23 Sep 2024 15:53:15 -0400
Subject: [PATCH] macos: use clang with c++17 standard
Change-Id: I0bcf97bc3cc338a1e6e182089638e0d62f2994af
---
extras/scripts/build_daemon_macos.sh | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/extras/scripts/build_daemon_macos.sh b/extras/scripts/build_daemon_macos.sh
index bd71911b6..adf55fbee 100755
--- a/extras/scripts/build_daemon_macos.sh
+++ b/extras/scripts/build_daemon_macos.sh
@@ -99,6 +99,12 @@ for ARCH in "${ARCHS[@]}"; do
echo "$ARCH"
cd "$DAEMON"
HOST="${ARCH}-apple-darwin"
+ SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
+
+ CC="xcrun -sdk macosx clang"
+ CXX="xcrun -sdk macosx clang++"
+ CFLAGS="-arch $ARCH -isysroot $SDKROOT"
+ CXXFLAGS="-std=c++17 $CFLAGS"
CONFIGURE_FLAGS=" --without-dbus --host=${HOST} -with-contrib=$DAEMON/contrib/${ARCH}-apple-darwin${OS_VER} --prefix=${INSTALL}/daemon/$ARCH"
if [ "${debug}" = "true" ]; then
@@ -113,7 +119,11 @@ for ARCH in "${ARCHS[@]}"; do
mkdir -p "build-macos-${ARCH}"
cd "build-macos-${ARCH}"
- "$DAEMON"/configure $CONFIGURE_FLAGS ARCH="$ARCH" || exit 1
+ "$DAEMON"/configure $CONFIGURE_FLAGS ARCH="$ARCH" \
+ CC="$CC $CFLAGS" \
+ CXX="$CXX $CXXFLAGS" \
+ CFLAGS="$CFLAGS" \
+ CXXFLAGS="$CXXFLAGS" || exit 1
echo "$CONFIGURE_FLAGS"
--
GitLab