From 1b0b551fc633b97dcb950195c149c94f6d8e9c3a Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Tue, 24 Jun 2025 12:10:01 +0700 Subject: [PATCH] handle case where libphp.so is built instead of libphp-release.so --- src/SPC/builder/linux/LinuxBuilder.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php index 29eb92e6..eb49f579 100644 --- a/src/SPC/builder/linux/LinuxBuilder.php +++ b/src/SPC/builder/linux/LinuxBuilder.php @@ -105,7 +105,7 @@ class LinuxBuilder extends UnixBuilderBase $disable_jit = $this->getOption('disable-opcache-jit', false) ? '--disable-opcache-jit ' : ''; $cc = trim(getenv('CC')); if (!$disable_jit && $this->getExt('opcache') && str_contains($cc, 'zig')) { - f_putenv("CC=$cc -fno-sanitize=undefined"); + f_putenv("CC={$cc} -fno-sanitize=undefined"); } $config_file_path = $this->getOption('with-config-file-path', false) ? @@ -180,7 +180,7 @@ class LinuxBuilder extends UnixBuilderBase $this->buildEmbed(); } if (!$disable_jit && $this->getExt('opcache') && str_contains($cc, 'zig')) { - f_putenv("CC=$cc"); + f_putenv("CC={$cc}"); } if ($enableFrankenphp) { logger()->info('building frankenphp'); @@ -300,9 +300,13 @@ class LinuxBuilder extends UnixBuilderBase $release = $matches[1]; $realLibName = 'libphp-' . $release . '.so'; $cwd = getcwd(); - if (file_exists($realLibName)) { - $realLib = BUILD_LIB_PATH . '/' . $realLibName; - rename(BUILD_LIB_PATH . '/libphp.so', $realLib); + $libphpPath = BUILD_LIB_PATH . '/libphp.so'; + $libphpRelease = BUILD_LIB_PATH . '/' . $realLibName; + if (!file_exists($libphpRelease) && file_exists($libphpPath)) { + rename($libphpPath, $libphpRelease); + } + if (file_exists($libphpRelease)) { + rename(BUILD_LIB_PATH . '/libphp.so', $libphpRelease); chdir(BUILD_LIB_PATH); symlink($realLibName, 'libphp.so'); }