Merge pull request #889 from crazywhalecc/franken

use our toolchain for go mod

Author: henderkes

config/lib.json

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

src/SPC/builder/unix/UnixBuilderBase.php

@@ -255,6 +255,7 @@ protected function patchPhpScripts(): void
 
     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 @@ protected function buildFrankenphp(): void
             '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;
             }
         }