diff --git a/config/lib.json b/config/lib.json index 7d1ad213..bda0baad 100644 --- a/config/lib.json +++ b/config/lib.json @@ -17,6 +17,9 @@ "lib-suggests-unix": [ "brotli", "watcher" + ], + "lib-depends-macos": [ + "libxml2" ] }, "micro": { diff --git a/src/SPC/builder/unix/UnixBuilderBase.php b/src/SPC/builder/unix/UnixBuilderBase.php index e15e09c3..3beca8bf 100644 --- a/src/SPC/builder/unix/UnixBuilderBase.php +++ b/src/SPC/builder/unix/UnixBuilderBase.php @@ -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; } }