mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-10 02:15:36 +08:00
forward port #1142
This commit is contained in:
@@ -108,7 +108,7 @@ class go_xcaddy
|
|||||||
'GOROOT' => "{$target_path}",
|
'GOROOT' => "{$target_path}",
|
||||||
'GOBIN' => "{$target_path}/bin",
|
'GOBIN' => "{$target_path}/bin",
|
||||||
'GOPATH' => "{$target_path}/go",
|
'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");
|
GlobalEnvManager::addPathIfNotExists("{$target_path}/bin");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,11 +104,12 @@ trait frankenphp
|
|||||||
"-tags={$muslTags}nobadger,nomysql,nopgx{$no_brotli}{$no_watcher}",
|
"-tags={$muslTags}nobadger,nomysql,nopgx{$no_brotli}{$no_watcher}",
|
||||||
'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
|
'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'));
|
InteractiveTerm::setMessage('Building frankenphp: ' . ConsoleColor::yellow('building with xcaddy'));
|
||||||
shell()->cd(BUILD_LIB_PATH)
|
shell()->cd(BUILD_LIB_PATH)
|
||||||
->setEnv($env)
|
->setEnv($env)
|
||||||
->exec('go clean -cache') // fix stale include evaluation
|
->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');
|
$builder->deployBinary(BUILD_LIB_PATH . '/frankenphp', BUILD_BIN_PATH . '/frankenphp');
|
||||||
$package->setOutput('Binary path for FrankenPHP SAPI', BUILD_BIN_PATH . '/frankenphp');
|
$package->setOutput('Binary path for FrankenPHP SAPI', BUILD_BIN_PATH . '/frankenphp');
|
||||||
|
|||||||
Reference in New Issue
Block a user