From ef3025798da0c24595d0698b79176472c46cca66 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Mon, 25 Aug 2025 09:29:06 +0700 Subject: [PATCH 1/5] fix gcc compiler version --- src/SPC/toolchain/GccNativeToolchain.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SPC/toolchain/GccNativeToolchain.php b/src/SPC/toolchain/GccNativeToolchain.php index b8e26c25..d8eb8d1a 100644 --- a/src/SPC/toolchain/GccNativeToolchain.php +++ b/src/SPC/toolchain/GccNativeToolchain.php @@ -42,7 +42,7 @@ class GccNativeToolchain implements ToolchainInterface $compiler = getenv('CC') ?: 'gcc'; $version = shell(false)->execWithResult("{$compiler} --version", false); $head = pathinfo($compiler, PATHINFO_BASENAME); - if ($version[0] === 0 && preg_match('/gcc.*(\d+.\d+.\d+)/', $version[1][0], $match)) { + if ($version[0] === 0 && preg_match('/gcc.*?(\d+\.\d+\.\d+)/', $version[1][0], $match)) { return "{$head} {$match[1]}"; } return $head; From 2ed8bbf391b4f450ee52621f104fdf8cd57d4a0e Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Mon, 25 Aug 2025 09:29:19 +0700 Subject: [PATCH 2/5] add cflags and ldflags to frankenphp build --- src/SPC/builder/unix/UnixBuilderBase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SPC/builder/unix/UnixBuilderBase.php b/src/SPC/builder/unix/UnixBuilderBase.php index d9a72c21..54d59203 100644 --- a/src/SPC/builder/unix/UnixBuilderBase.php +++ b/src/SPC/builder/unix/UnixBuilderBase.php @@ -282,8 +282,8 @@ abstract class UnixBuilderBase extends BuilderBase $config = (new SPCConfigUtil($this))->config($this->ext_list, $this->lib_list); $env = [ 'CGO_ENABLED' => '1', - 'CGO_CFLAGS' => $config['cflags'], - 'CGO_LDFLAGS' => "{$staticFlags} {$config['ldflags']} {$config['libs']} {$lrt}", + 'CGO_CFLAGS' => $this->arch_c_flags . ' ' . $config['cflags'], + 'CGO_LDFLAGS' => $this->arch_ld_flags . " {$staticFlags} {$config['ldflags']} {$config['libs']} {$lrt} -lgcov", 'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' . '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' . $debugFlags . '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' . From df60ccff0e52fae35466d5f3bb2189aa2b6dd9d8 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Mon, 25 Aug 2025 09:52:03 +0700 Subject: [PATCH 3/5] also make sure clang version uses dots --- src/SPC/toolchain/ClangNativeToolchain.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SPC/toolchain/ClangNativeToolchain.php b/src/SPC/toolchain/ClangNativeToolchain.php index ad09244c..a57b2e8b 100644 --- a/src/SPC/toolchain/ClangNativeToolchain.php +++ b/src/SPC/toolchain/ClangNativeToolchain.php @@ -45,7 +45,7 @@ class ClangNativeToolchain implements ToolchainInterface $compiler = getenv('CC') ?: 'clang'; $version = shell(false)->execWithResult("{$compiler} --version", false); $head = pathinfo($compiler, PATHINFO_BASENAME); - if ($version[0] === 0 && preg_match('/clang version (\d+.\d+.\d+)/', $version[1][0], $match)) { + if ($version[0] === 0 && preg_match('/clang version (\d+\.\d+\.\d+)/', $version[1][0], $match)) { return "{$head} {$match[1]}"; } return $head; From 2558c02470e7354b44ec2a93d05cc4ae6aa7ce84 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Mon, 25 Aug 2025 09:59:06 +0700 Subject: [PATCH 4/5] oopsie --- src/SPC/builder/unix/UnixBuilderBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SPC/builder/unix/UnixBuilderBase.php b/src/SPC/builder/unix/UnixBuilderBase.php index 54d59203..0abf44b4 100644 --- a/src/SPC/builder/unix/UnixBuilderBase.php +++ b/src/SPC/builder/unix/UnixBuilderBase.php @@ -283,7 +283,7 @@ abstract class UnixBuilderBase extends BuilderBase $env = [ 'CGO_ENABLED' => '1', 'CGO_CFLAGS' => $this->arch_c_flags . ' ' . $config['cflags'], - 'CGO_LDFLAGS' => $this->arch_ld_flags . " {$staticFlags} {$config['ldflags']} {$config['libs']} {$lrt} -lgcov", + 'CGO_LDFLAGS' => $this->arch_ld_flags . " {$staticFlags} {$config['ldflags']} {$config['libs']} {$lrt}", 'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' . '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' . $debugFlags . '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' . From af90b840ee222935b711aec92a7e59b16508183e Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Mon, 25 Aug 2025 09:59:27 +0700 Subject: [PATCH 5/5] format string --- src/SPC/builder/unix/UnixBuilderBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SPC/builder/unix/UnixBuilderBase.php b/src/SPC/builder/unix/UnixBuilderBase.php index 0abf44b4..9693db8d 100644 --- a/src/SPC/builder/unix/UnixBuilderBase.php +++ b/src/SPC/builder/unix/UnixBuilderBase.php @@ -283,7 +283,7 @@ abstract class UnixBuilderBase extends BuilderBase $env = [ 'CGO_ENABLED' => '1', 'CGO_CFLAGS' => $this->arch_c_flags . ' ' . $config['cflags'], - 'CGO_LDFLAGS' => $this->arch_ld_flags . " {$staticFlags} {$config['ldflags']} {$config['libs']} {$lrt}", + 'CGO_LDFLAGS' => "{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$config['libs']} {$lrt}", 'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' . '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' . $debugFlags . '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .