Skip to content

Commit 7042fe2

Browse files
committed
chore: wip
1 parent a8dced5 commit 7042fe2

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

.github/workflows/precompile-php.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ jobs:
298298
"-I$(brew --prefix openldap)/include"
299299
)
300300
echo "CPPFLAGS=$(IFS=' '; echo "${CPPFLAGS_PATHS[*]}")" >> $GITHUB_ENV
301-
echo "CXXFLAGS=-std=c++14 -stdlib=libc++" >> $GITHUB_ENV
301+
echo "CXXFLAGS=-std=c++17 -stdlib=libc++" >> $GITHUB_ENV
302302
303303
# Set readline-specific paths
304304
echo "READLINE_CFLAGS=-I$(brew --prefix readline)/include" >> $GITHUB_ENV
@@ -395,17 +395,26 @@ jobs:
395395
echo "Debug: LDAP environment variables cleared"
396396
fi
397397
398-
# Set C++14 flag for ICU4C compatibility - set explicitly
399-
# Only apply C++14 to C++ compiler, not C compiler
400-
export CXXFLAGS="-std=c++14 -stdlib=libc++"
398+
# Set C++17 flag for ICU4C compatibility - set explicitly
399+
# Only apply C++17 to C++ compiler, not C compiler
400+
export CXXFLAGS="-std=c++17 -stdlib=libc++"
401401
# Keep CFLAGS clean for C compiler
402402
export CFLAGS=""
403403
export CPPFLAGS="$CPPFLAGS"
404-
echo "Set C++14 flags for configure step"
404+
echo "Set C++17 flags for configure step"
405405
echo "CXXFLAGS: $CXXFLAGS"
406406
echo "CFLAGS: $CFLAGS"
407407
echo "CPPFLAGS: $CPPFLAGS"
408408
409+
# Ensure we're using clang++ on macOS
410+
if command -v clang++ >/dev/null 2>&1; then
411+
export CC=clang
412+
export CXX=clang++
413+
echo "Using clang/clang++ compilers"
414+
echo "CC: $CC"
415+
echo "CXX: $CXX"
416+
fi
417+
409418
# Try to find readline.h and set the path explicitly
410419
READLINE_PATH=$(brew --prefix readline)
411420
if [[ -f "$READLINE_PATH/include/readline/readline.h" ]]; then
@@ -496,13 +505,13 @@ jobs:
496505
# Use all available CPU cores for faster builds
497506
if [[ "${{ matrix.platform }}" == "darwin" ]]; then
498507
JOBS=$(sysctl -n hw.ncpu)
499-
# Ensure C++14 is used during build - set explicitly
500-
# Only apply C++14 to C++ compiler, not C compiler
501-
export CXXFLAGS="-std=c++14 -stdlib=libc++"
508+
# Ensure C++17 is used during build - set explicitly
509+
# Only apply C++17 to C++ compiler, not C compiler
510+
export CXXFLAGS="-std=c++17 -stdlib=libc++"
502511
# Keep CFLAGS clean for C compiler
503512
export CFLAGS=""
504513
export CPPFLAGS="$CPPFLAGS"
505-
echo "Set C++14 flags for macOS build"
514+
echo "Set C++17 flags for macOS build"
506515
else
507516
JOBS=$(nproc)
508517
fi

0 commit comments

Comments
 (0)