1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Fix ccache for alpine and msan

Declare CC/CXX through the ccache action.

Closes GH-21286
This commit is contained in:
Ilija Tovilo
2026-02-24 10:14:29 +01:00
parent ee40ca3fe2
commit 68d4ee357b
2 changed files with 12 additions and 6 deletions

View File

@@ -5,6 +5,12 @@ inputs:
php_directory:
required: false
default: '.'
cc:
required: false
default: 'gcc'
cxx:
required: false
default: 'g++'
runs:
using: composite
steps:
@@ -29,5 +35,5 @@ runs:
- name: Export CC/CXX
shell: bash
run: |
echo "CC=ccache gcc" >> $GITHUB_ENV
echo "CXX=ccache g++" >> $GITHUB_ENV
echo "CC=ccache ${{ inputs.cc }}" >> $GITHUB_ENV
echo "CXX=ccache ${{ inputs.cxx }}" >> $GITHUB_ENV

View File

@@ -76,14 +76,14 @@ jobs:
uses: ./.github/actions/ccache
with:
name: "${{ github.job }}"
cc: clang-20
cxx: clang++-20
- name: ./configure
uses: ./.github/actions/configure-alpine
with:
configurationParameters: >-
CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
CC=clang-20
CXX=clang++-20
--enable-debug
--enable-zts
skipSlow: true # FIXME: This should likely include slow extensions
@@ -708,10 +708,10 @@ jobs:
uses: ./.github/actions/ccache
with:
name: "${{ github.job }}"
cc: clang
cxx: clang++
- name: ./configure
run: |
export CC=clang
export CXX=clang++
export CFLAGS="-DZEND_TRACK_ARENA_ALLOC"
./buildconf --force
# msan requires all used libraries to be instrumented,