Merge remote-tracking branch 'origin/php-85' into php-85

This commit is contained in:
crazywhalecc 2025-08-03 22:55:17 +08:00
commit 3c09ba59d7
No known key found for this signature in database
GPG Key ID: 1F4BDD59391F2680
2 changed files with 1 additions and 3 deletions

View File

@ -359,7 +359,6 @@ class LinuxBuilder extends UnixBuilderBase
$static = SPCTarget::isStatic() ? '-all-static' : '';
$lib = BUILD_LIB_PATH;
return [
// 'CPPFLAGS' => '-Dsomethinghere',
'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
'EXTRA_LIBS' => $config['libs'],
'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),

View File

@ -98,8 +98,7 @@ class MacOSBuilder extends UnixBuilderBase
$this->emitPatchPoint('before-php-configure');
SourcePatcher::patchBeforeConfigure($this);
$phpVersionID = $this->getPHPVersionID();
$json_74 = $phpVersionID < 80000 ? '--enable-json ' : '';
$json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
$zts = $this->getOption('enable-zts', false) ? '--enable-zts --disable-zend-signals ' : '';
$opcache_jit = !$this->getOption('disable-opcache-jit', false);