From 07aae79cae3bb5d6a8661aa640f806e1f73783c9 Mon Sep 17 00:00:00 2001 From: henderkes Date: Sat, 16 May 2026 19:16:24 +0700 Subject: [PATCH] forward port #1142 --- src/Package/Artifact/go_xcaddy.php | 2 +- src/Package/Target/php/frankenphp.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Package/Artifact/go_xcaddy.php b/src/Package/Artifact/go_xcaddy.php index d4a732f1..08bf02d3 100644 --- a/src/Package/Artifact/go_xcaddy.php +++ b/src/Package/Artifact/go_xcaddy.php @@ -108,7 +108,7 @@ class go_xcaddy 'GOROOT' => "{$target_path}", 'GOBIN' => "{$target_path}/bin", 'GOPATH' => "{$target_path}/go", - ])->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest'); + ])->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master'); GlobalEnvManager::addPathIfNotExists("{$target_path}/bin"); } } diff --git a/src/Package/Target/php/frankenphp.php b/src/Package/Target/php/frankenphp.php index 3114a0d6..663f495e 100644 --- a/src/Package/Target/php/frankenphp.php +++ b/src/Package/Target/php/frankenphp.php @@ -104,11 +104,12 @@ trait frankenphp "-tags={$muslTags}nobadger,nomysql,nopgx{$no_brotli}{$no_watcher}", 'LD_LIBRARY_PATH' => BUILD_LIB_PATH, ]; + $pgo = file_exists("{$source_dir}/caddy/frankenphp/default.pgo") ? "--pgo {$source_dir}/caddy/frankenphp/default.pgo " : ''; InteractiveTerm::setMessage('Building frankenphp: ' . ConsoleColor::yellow('building with xcaddy')); shell()->cd(BUILD_LIB_PATH) ->setEnv($env) ->exec('go clean -cache') // fix stale include evaluation - ->exec("xcaddy build --output frankenphp {$xcaddy_modules}"); + ->exec("xcaddy build --output frankenphp {$pgo}{$xcaddy_modules}"); $builder->deployBinary(BUILD_LIB_PATH . '/frankenphp', BUILD_BIN_PATH . '/frankenphp'); $package->setOutput('Binary path for FrankenPHP SAPI', BUILD_BIN_PATH . '/frankenphp');