diff --git a/src/SPC/store/pkg/Zig.php b/src/SPC/store/pkg/Zig.php index f6025b57..eb56fdc4 100644 --- a/src/SPC/store/pkg/Zig.php +++ b/src/SPC/store/pkg/Zig.php @@ -16,7 +16,13 @@ class Zig extends CustomPackage public static function isInstalled(): bool { $path = self::getPath(); - return file_exists("{$path}/zig") && file_exists("{$path}/zig-cc") && file_exists("{$path}/zig-c++"); + $files = ['zig', 'zig-cc', 'zig-c++', 'zig-ar', 'zig-ranlib', 'zig-objcopy']; + foreach ($files as $file) { + if (!file_exists("{$path}/{$file}")) { + return false; + } + } + return true; } public function getSupportName(): array diff --git a/src/SPC/toolchain/ZigToolchain.php b/src/SPC/toolchain/ZigToolchain.php index 3ededcbc..1d3900d6 100644 --- a/src/SPC/toolchain/ZigToolchain.php +++ b/src/SPC/toolchain/ZigToolchain.php @@ -16,7 +16,7 @@ class ZigToolchain implements ToolchainInterface GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CC=zig-cc'); GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CXX=zig-c++'); GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_AR=zig-ar'); - GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=zig-cc'); + GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=ld'); GlobalEnvManager::putenv('RANLIB=zig-ranlib'); GlobalEnvManager::putenv('OBJCOPY=zig-objcopy');