diff --git a/src/SPC/toolchain/ZigToolchain.php b/src/SPC/toolchain/ZigToolchain.php
index e9ce220c..a379164c 100644
--- a/src/SPC/toolchain/ZigToolchain.php
+++ b/src/SPC/toolchain/ZigToolchain.php
@@ -15,8 +15,8 @@ class ZigToolchain implements ToolchainInterface
         // Set environment variables for zig toolchain
         GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CC=zig-cc');
         GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CXX=zig-c++');
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_AR=ar');
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=ld');
+        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_AR=zig ar');
+        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=zig-cc');
 
         // Generate additional object needed for zig toolchain
         $paths = ['/usr/lib/gcc', '/usr/local/lib/gcc'];
diff --git a/src/SPC/util/UnixShell.php b/src/SPC/util/UnixShell.php
index ffe18910..3e96e4bd 100644
--- a/src/SPC/util/UnixShell.php
+++ b/src/SPC/util/UnixShell.php
@@ -61,9 +61,9 @@ class UnixShell
     {
         $this->setEnv([
             'CFLAGS' => $library->getLibExtraCFlags(),
+            'CXXFLAGS' => $library->getLibExtraCXXFlags(),
             'LDFLAGS' => $library->getLibExtraLdFlags(),
             'LIBS' => $library->getLibExtraLibs(),
-            'CXXFLAGS' => $library->getLibExtraCXXFlags(),
         ]);
         return $this;
     }
diff --git a/src/SPC/util/executor/UnixAutoconfExecutor.php b/src/SPC/util/executor/UnixAutoconfExecutor.php
index 8f923b1f..4543bd7b 100644
--- a/src/SPC/util/executor/UnixAutoconfExecutor.php
+++ b/src/SPC/util/executor/UnixAutoconfExecutor.php
@@ -135,6 +135,7 @@ class UnixAutoconfExecutor extends Executor
     {
         $this->shell = shell()->cd($this->library->getSourceDir())->initializeEnv($this->library)->appendEnv([
             'CFLAGS' => "-I{$this->library->getIncludeDir()}",
+            'CXXFLAGS' => "-I{$this->library->getIncludeDir()}",
             'LDFLAGS' => "-L{$this->library->getLibDir()}",
         ]);
     }