From 2564da2615267ec20755556f2d406632481f3d6d Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Sun, 29 Jun 2025 16:56:24 +0700 Subject: [PATCH] Reapply "just strip out the error and return the output instead of executing again without version" This reverts commit 1d29ac228c42531a5f008e480c3cb538e7769e36. --- src/SPC/store/scripts/zig-cc.sh | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/SPC/store/scripts/zig-cc.sh b/src/SPC/store/scripts/zig-cc.sh index 1459a0fc..343fec51 100644 --- a/src/SPC/store/scripts/zig-cc.sh +++ b/src/SPC/store/scripts/zig-cc.sh @@ -72,21 +72,13 @@ else status=$? if [ $status -eq 0 ]; then - echo "$output" | grep -v "version '.*' in target triple" + echo "$output" exit 0 fi if echo "$output" | grep -q "version '.*' in target triple"; then - TARGET_FALLBACK="${SPC_TARGET}-${SPC_LIBC}" - output=$(zig cc -target "$TARGET_FALLBACK" -lstdc++ ${COMPILER_EXTRA} "${PARSED_ARGS[@]}" 2>&1) - status=$? - - if [ $status -eq 0 ]; then - echo "$output" - exit 0 - else - exec zig cc -target "$TARGET_FALLBACK" ${COMPILER_EXTRA} "${PARSED_ARGS[@]}" - fi + echo "$output" | grep -v "version '.*' in target triple" + exit 0 else exec zig cc -target "$TARGET" ${COMPILER_EXTRA} "${PARSED_ARGS[@]}" fi