crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-18 04:44:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #889 from crazywhalecc/franken

Browse Source 
use our toolchain for go mod
This commit is contained in:
Marc 2025-09-05 11:47:15 +02:00 committed by GitHub
commit 2a2f4120b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/lib.json
View File

@ -17,6 +17,9 @@
"lib-suggests-unix": [ "lib-suggests-unix": [
"brotli", "brotli",
"watcher" "watcher"
],
"lib-depends-macos": [
"libxml2"
] ]
}, },
"micro": { "micro": {

5
src/SPC/builder/unix/UnixBuilderBase.php
View File

@ -255,6 +255,7 @@ abstract class UnixBuilderBase extends BuilderBase
protected function buildFrankenphp(): void protected function buildFrankenphp(): void
{ {
GlobalEnvManager::addPathIfNotExists(GoXcaddy::getEnvironment()['PATH']);
$nobrotli = $this->getLib('brotli') === null ? ',nobrotli' : ''; $nobrotli = $this->getLib('brotli') === null ? ',nobrotli' : '';
$nowatcher = $this->getLib('watcher') === null ? ',nowatcher' : ''; $nowatcher = $this->getLib('watcher') === null ? ',nowatcher' : '';
$xcaddyModules = getenv('SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES'); $xcaddyModules = getenv('SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES');
@ -310,9 +311,7 @@ abstract class UnixBuilderBase extends BuilderBase
'LD_LIBRARY_PATH' => BUILD_LIB_PATH, 'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
]; ];
foreach (GoXcaddy::getEnvironment() as $key => $value) { foreach (GoXcaddy::getEnvironment() as $key => $value) {
if ($key === 'PATH') { if ($key !== 'PATH') {
GlobalEnvManager::addPathIfNotExists($value);
} else {
$env[$key] = $value; $env[$key] = $value;
} }
} }