From d6b2b96aa813fb7e97c437c4c694260bde5773ff Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Wed, 15 Jul 2026 12:59:20 +0800 Subject: [PATCH] Apply go_xcaddy patch changes in feat/pgo-v3 --- src/Package/Artifact/go_xcaddy.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Package/Artifact/go_xcaddy.php b/src/Package/Artifact/go_xcaddy.php index 51ccfb87..08bf02d3 100644 --- a/src/Package/Artifact/go_xcaddy.php +++ b/src/Package/Artifact/go_xcaddy.php @@ -25,7 +25,6 @@ class go_xcaddy ])] public function downBinary(ArtifactDownloader $downloader): DownloadResult { - $pkgroot = PKG_ROOT_PATH; $name = SystemTarget::getCurrentPlatformString(); $arch = match (explode('-', $name)[1]) { 'x86_64' => 'amd64', @@ -64,7 +63,7 @@ class go_xcaddy if ($file_hash !== $hash) { throw new DownloaderException("Hash mismatch for downloaded go-xcaddy binary. Expected {$hash}, got {$file_hash}"); } - return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: "{$pkgroot}/go-xcaddy", verified: true, version: $version); + return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: '{pkg_root_path}/go-xcaddy', verified: true, version: $version); } #[CustomBinaryCheckUpdate('go-xcaddy', [ @@ -109,7 +108,7 @@ class go_xcaddy 'GOROOT' => "{$target_path}", 'GOBIN' => "{$target_path}/bin", 'GOPATH' => "{$target_path}/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'); GlobalEnvManager::addPathIfNotExists("{$target_path}/bin"); } }