From 42b42729657fb4b4f65f837dbd7ec90599c7098b Mon Sep 17 00:00:00 2001
From: DubbleClick <m@pyc.ac>
Date: Sat, 26 Jul 2025 23:46:36 +0700
Subject: [PATCH] idk

---
 .github/workflows/tests.yml        | 11 +++--------
 src/SPC/command/BaseCommand.php    |  1 -
 src/SPC/toolchain/ZigToolchain.php |  4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a00e2fdf..a360e54a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -177,11 +177,6 @@ jobs:
       - name: "Install Dependencies"
         run: composer update -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
-      - name: "Prepare Zig for Linux"
-        if: ${{ startsWith(matrix.os, 'ubuntu-24') }}
-        run: |
-          SPC_TARGET=native-native php bin/spc install-pkg zig
-
       - name: "Run Build Tests (doctor)"
         run: php src/globals/test-extensions.php doctor_cmd ${{ matrix.os }} ${{ matrix.php }}
 
@@ -207,6 +202,6 @@ jobs:
         if: ${{ !startsWith(matrix.os, 'windows-') }}
         run: php src/globals/test-extensions.php build_embed_cmd ${{ matrix.os }} ${{ matrix.php }}
 
-      - name: Setup tmate session
-        if: ${{ failure() }}
-        uses: mxschmitt/action-tmate@v3
+#      - name: Setup tmate session
+#        if: ${{ failure() }}
+#        uses: mxschmitt/action-tmate@v3
diff --git a/src/SPC/command/BaseCommand.php b/src/SPC/command/BaseCommand.php
index 870ac6de..9c07b074 100644
--- a/src/SPC/command/BaseCommand.php
+++ b/src/SPC/command/BaseCommand.php
@@ -99,7 +99,6 @@ abstract class BaseCommand extends Command
         // init GlobalEnv
         if (!$this instanceof BuildCommand) {
             GlobalEnvManager::init();
-            GlobalEnvManager::afterInit();
             f_putenv('SPC_SKIP_TOOLCHAIN_CHECK=yes');
         }
         if ($this->shouldExecute()) {
diff --git a/src/SPC/toolchain/ZigToolchain.php b/src/SPC/toolchain/ZigToolchain.php
index 1d3900d6..b8061b0d 100644
--- a/src/SPC/toolchain/ZigToolchain.php
+++ b/src/SPC/toolchain/ZigToolchain.php
@@ -17,8 +17,6 @@ class ZigToolchain implements ToolchainInterface
         GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CXX=zig-c++');
         GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_AR=zig-ar');
         GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=ld');
-        GlobalEnvManager::putenv('RANLIB=zig-ranlib');
-        GlobalEnvManager::putenv('OBJCOPY=zig-objcopy');
 
         // Generate additional objects needed for zig toolchain
         $paths = ['/usr/lib/gcc', '/usr/local/lib/gcc'];
@@ -61,6 +59,8 @@ class ZigToolchain implements ToolchainInterface
         GlobalEnvManager::putenv("SPC_DEFAULT_C_FLAGS={$cflags}");
         GlobalEnvManager::putenv("SPC_DEFAULT_CXX_FLAGS={$cxxflags}");
         GlobalEnvManager::putenv("SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS={$extraCflags}");
+        GlobalEnvManager::putenv('RANLIB=zig-ranlib');
+        GlobalEnvManager::putenv('OBJCOPY=zig-objcopy');
         $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
         if (!str_contains($extra_libs, '-lunwind')) {
             // Add unwind library if not already present