From fd882ce03e6ee8cf83b0ddc3458b73082108b3e9 Mon Sep 17 00:00:00 2001 From: henderkes Date: Sat, 16 May 2026 19:11:35 +0700 Subject: [PATCH] forward port #1138 --- src/SPC/builder/unix/UnixBuilderBase.php | 3 ++- src/SPC/store/pkg/GoXcaddy.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SPC/builder/unix/UnixBuilderBase.php b/src/SPC/builder/unix/UnixBuilderBase.php index fd16656ce..14e6c1f0f 100644 --- a/src/SPC/builder/unix/UnixBuilderBase.php +++ b/src/SPC/builder/unix/UnixBuilderBase.php @@ -463,9 +463,10 @@ protected function buildFrankenphp(): void "-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}", 'LD_LIBRARY_PATH' => BUILD_LIB_PATH, ], ...GoXcaddy::getEnvironment()]; + $pgo = file_exists("{$frankenphpSourceDir}/caddy/frankenphp/default.pgo") ? "--pgo {$frankenphpSourceDir}/caddy/frankenphp/default.pgo " : ''; shell()->cd(BUILD_BIN_PATH) ->setEnv($env) - ->exec("xcaddy build --output frankenphp {$xcaddyModules}"); + ->exec("xcaddy build --output frankenphp {$pgo}{$xcaddyModules}"); $this->deploySAPIBinary(BUILD_TARGET_FRANKENPHP); } diff --git a/src/SPC/store/pkg/GoXcaddy.php b/src/SPC/store/pkg/GoXcaddy.php index 462342dba..ce15bf054 100644 --- a/src/SPC/store/pkg/GoXcaddy.php +++ b/src/SPC/store/pkg/GoXcaddy.php @@ -85,7 +85,7 @@ public function extract(string $name): void 'GOBIN' => "{$pkgroot}/go-xcaddy/bin", 'GOPATH' => "{$pkgroot}/go", ]) - ->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest'); + ->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master'); } public static function getEnvironment(): array