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

Author: crazywhalecc

src/SPC/builder/linux/LinuxBuilder.php

@@ -359,7 +359,6 @@ private function getMakeExtraVars(): array
         $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'),

src/SPC/builder/macos/MacOSBuilder.php

@@ -98,8 +98,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
         $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);