From 3b9efcb2d4821738781dffd61c09c6772a483d3a Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 31 Aug 2025 15:24:29 +0800 Subject: [PATCH] Put it into toolchain manager to skip in unit test --- src/SPC/toolchain/ToolchainManager.php | 10 ++++++++++ src/SPC/util/GlobalEnvManager.php | 8 -------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/SPC/toolchain/ToolchainManager.php b/src/SPC/toolchain/ToolchainManager.php index 3fe48ae1..ff22acae 100644 --- a/src/SPC/toolchain/ToolchainManager.php +++ b/src/SPC/toolchain/ToolchainManager.php @@ -7,6 +7,7 @@ namespace SPC\toolchain; use SPC\builder\linux\SystemUtil; use SPC\exception\WrongUsageException; use SPC\util\GlobalEnvManager; +use SPC\util\PkgConfigUtil; use SPC\util\SPCTarget; class ToolchainManager @@ -56,6 +57,15 @@ class ToolchainManager if (SPCTarget::getLibc() === 'glibc' && SystemUtil::isMuslDist()) { throw new WrongUsageException('You are linking against glibc dynamically, which is only supported on glibc distros.'); } + + // init pkg-config for unix + if (is_unix()) { + if (($found = PkgConfigUtil::findPkgConfig()) === null) { + throw new WrongUsageException('Cannot find pkg-config executable. Please run `doctor` to fix this.'); + } + GlobalEnvManager::putenv("PKG_CONFIG={$found}"); + } + $toolchain = getenv('SPC_TOOLCHAIN'); /* @var ToolchainInterface $toolchain */ $instance = new $toolchain(); diff --git a/src/SPC/util/GlobalEnvManager.php b/src/SPC/util/GlobalEnvManager.php index f3af8971..9f74d2df 100644 --- a/src/SPC/util/GlobalEnvManager.php +++ b/src/SPC/util/GlobalEnvManager.php @@ -122,14 +122,6 @@ class GlobalEnvManager self::putenv("YACC={$yacc}"); } } - - // init pkg-config for unix - if (is_unix()) { - if (($found = PkgConfigUtil::findPkgConfig()) === null) { - throw new WrongUsageException('Cannot find pkg-config executable. Please run `doctor` to fix this.'); - } - self::putenv("PKG_CONFIG={$found}"); - } } private static function readIniFile(): array