Skip to content

Commit 7f61caf

Browse files
committed
chore: wip
1 parent 766c4d1 commit 7f61caf

File tree

1 file changed

+37
-6
lines changed

1 file changed

+37
-6
lines changed

.github/workflows/precompile-php.yml

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,14 @@ jobs:
395395
echo "Debug: LDAP environment variables cleared"
396396
fi
397397
398-
# Set C++17 flag for ICU4C compatibility
399-
export CXXFLAGS="$CXXFLAGS -std=c++17"
398+
# Set C++17 flag for ICU4C compatibility - set explicitly
399+
export CXXFLAGS="-std=c++17 -stdlib=libc++"
400+
export CFLAGS="-std=c++17"
401+
export CPPFLAGS="$CPPFLAGS -std=c++17"
402+
echo "Set C++17 flags for configure step"
403+
echo "CXXFLAGS: $CXXFLAGS"
404+
echo "CFLAGS: $CFLAGS"
405+
echo "CPPFLAGS: $CPPFLAGS"
400406
401407
# Try to find readline.h and set the path explicitly
402408
READLINE_PATH=$(brew --prefix readline)
@@ -472,14 +478,23 @@ jobs:
472478
echo "Final extensions: $FINAL_EXTENSIONS"
473479
fi
474480
481+
# Add C++17 configure option for macOS
482+
if [[ "${{ matrix.platform }}" == "darwin" ]]; then
483+
CONFIGURE_CXX="CXXFLAGS=-std=c++17 -stdlib=libc++ CFLAGS=-std=c++17"
484+
echo "Using C++17 configure flags: $CONFIGURE_CXX"
485+
else
486+
CONFIGURE_CXX=""
487+
fi
488+
475489
./configure \
476490
--prefix="$INSTALL_PREFIX" \
477491
--disable-debug \
478492
--enable-shared \
479493
--with-pic \
480494
$FINAL_EXTENSIONS \
481495
$EXTRA_CONFIG \
482-
$CURL_CONFIG
496+
$CURL_CONFIG \
497+
$CONFIGURE_CXX
483498
484499
- name: Build PHP
485500
run: |
@@ -488,16 +503,32 @@ jobs:
488503
# Use all available CPU cores for faster builds
489504
if [[ "${{ matrix.platform }}" == "darwin" ]]; then
490505
JOBS=$(sysctl -n hw.ncpu)
491-
# Ensure C++17 is used during build
492-
export CXXFLAGS="$CXXFLAGS -std=c++17"
493-
export CFLAGS="$CFLAGS -std=c++17"
506+
# Ensure C++17 is used during build - set explicitly
507+
export CXXFLAGS="-std=c++17 -stdlib=libc++"
508+
export CFLAGS="-std=c++17"
509+
export CPPFLAGS="$CPPFLAGS -std=c++17"
510+
echo "Set C++17 flags for macOS build"
494511
else
495512
JOBS=$(nproc)
496513
fi
497514
498515
echo "Building PHP with $JOBS parallel jobs"
499516
echo "CXXFLAGS: $CXXFLAGS"
500517
echo "CFLAGS: $CFLAGS"
518+
echo "CPPFLAGS: $CPPFLAGS"
519+
520+
# Show compiler version and flags
521+
echo "Compiler info:"
522+
which gcc || which clang || echo "No compiler found"
523+
gcc --version 2>/dev/null || clang --version 2>/dev/null || echo "Could not get compiler version"
524+
525+
# Check available C++ standards
526+
echo "Checking available C++ standards:"
527+
if command -v clang++ >/dev/null 2>&1; then
528+
echo "Available C++ standards for clang++:"
529+
clang++ --help | grep -E "std=" || echo "Could not determine available standards"
530+
fi
531+
501532
make -j$JOBS
502533
503534
- name: Install PHP

0 commit comments

Comments
 (0)