mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-03-18 04:44:53 +08:00
Merge pull request #889 from crazywhalecc/franken
use our toolchain for go mod
This commit is contained in:
commit
2a2f4120b9
@ -17,6 +17,9 @@
|
||||
"lib-suggests-unix": [
|
||||
"brotli",
|
||||
"watcher"
|
||||
],
|
||||
"lib-depends-macos": [
|
||||
"libxml2"
|
||||
]
|
||||
},
|
||||
"micro": {
|
||||
|
||||
@ -255,6 +255,7 @@ abstract class UnixBuilderBase extends BuilderBase
|
||||
|
||||
protected function buildFrankenphp(): void
|
||||
{
|
||||
GlobalEnvManager::addPathIfNotExists(GoXcaddy::getEnvironment()['PATH']);
|
||||
$nobrotli = $this->getLib('brotli') === null ? ',nobrotli' : '';
|
||||
$nowatcher = $this->getLib('watcher') === null ? ',nowatcher' : '';
|
||||
$xcaddyModules = getenv('SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES');
|
||||
@ -310,9 +311,7 @@ abstract class UnixBuilderBase extends BuilderBase
|
||||
'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
|
||||
];
|
||||
foreach (GoXcaddy::getEnvironment() as $key => $value) {
|
||||
if ($key === 'PATH') {
|
||||
GlobalEnvManager::addPathIfNotExists($value);
|
||||
} else {
|
||||
if ($key !== 'PATH') {
|
||||
$env[$key] = $value;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user