diff --git a/src/SPC/builder/Extension.php b/src/SPC/builder/Extension.php
index def4b5c8..61070f9d 100644
--- a/src/SPC/builder/Extension.php
+++ b/src/SPC/builder/Extension.php
@@ -405,6 +405,7 @@ class Extension
             'LDFLAGS' => $config['ldflags'],
             'LIBS' => $preStatic . $staticLibString . $postStatic . $sharedLibString,
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
+            'COMPILER_EXTRA' => '-lstdc++'
         ];
 
         if ($this->patchBeforeSharedPhpize()) {
diff --git a/src/SPC/store/scripts/zig-cc.sh b/src/SPC/store/scripts/zig-cc.sh
index 7b4b8e23..9520e6fe 100644
--- a/src/SPC/store/scripts/zig-cc.sh
+++ b/src/SPC/store/scripts/zig-cc.sh
@@ -42,15 +42,10 @@ fi
 output=$(zig cc $TARGET $COMPILER_EXTRA "${PARSED_ARGS[@]}" 2>&1)
 status=$?
 
-if [ $status -eq 0 ]; then
-    echo "$output"
-    exit 0
+if [ $status -ne 0 ] && echo "$output" | grep -q "version '.*' in target triple"; then
+    output=$(echo "$output" | grep -v "version '.*' in target triple")
+    status=0
 fi
 
-if echo "$output" | grep -q "version '.*' in target triple"; then
-    echo "$output" | grep -v "version '.*' in target triple"
-    exit 0
-else
-    echo "$output"
-    exit $status
-fi
+echo "$output"
+exit $status