@@ -298,7 +298,7 @@ jobs:
298
298
"-I$(brew --prefix openldap)/include"
299
299
)
300
300
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
302
302
303
303
# Set readline-specific paths
304
304
echo "READLINE_CFLAGS=-I$(brew --prefix readline)/include" >> $GITHUB_ENV
@@ -395,17 +395,26 @@ jobs:
395
395
echo "Debug: LDAP environment variables cleared"
396
396
fi
397
397
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++"
401
401
# Keep CFLAGS clean for C compiler
402
402
export CFLAGS=""
403
403
export CPPFLAGS="$CPPFLAGS"
404
- echo "Set C++14 flags for configure step"
404
+ echo "Set C++17 flags for configure step"
405
405
echo "CXXFLAGS: $CXXFLAGS"
406
406
echo "CFLAGS: $CFLAGS"
407
407
echo "CPPFLAGS: $CPPFLAGS"
408
408
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
+
409
418
# Try to find readline.h and set the path explicitly
410
419
READLINE_PATH=$(brew --prefix readline)
411
420
if [[ -f "$READLINE_PATH/include/readline/readline.h" ]]; then
@@ -496,13 +505,13 @@ jobs:
496
505
# Use all available CPU cores for faster builds
497
506
if [[ "${{ matrix.platform }}" == "darwin" ]]; then
498
507
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++"
502
511
# Keep CFLAGS clean for C compiler
503
512
export CFLAGS=""
504
513
export CPPFLAGS="$CPPFLAGS"
505
- echo "Set C++14 flags for macOS build"
514
+ echo "Set C++17 flags for macOS build"
506
515
else
507
516
JOBS=$(nproc)
508
517
fi
0 commit comments