Revert "just strip out the error and return the output instead of executing again without version"

This reverts commit d588e6e4fd8df910a39603949191d5e7170a219e.
This commit is contained in:
DubbleClick 2025-06-29 10:40:48 +07:00
parent a44d90671c
commit 1d29ac228c

View File

@ -72,13 +72,21 @@ else
status=$? status=$?
if [ $status -eq 0 ]; then if [ $status -eq 0 ]; then
echo "$output" echo "$output" | grep -v "version '.*' in target triple"
exit 0 exit 0
fi fi
if echo "$output" | grep -q "version '.*' in target triple"; then if echo "$output" | grep -q "version '.*' in target triple"; then
echo "$output" | grep -v "version '.*' in target triple" TARGET_FALLBACK="${SPC_TARGET}-${SPC_LIBC}"
exit 0 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
else else
exec zig cc -target "$TARGET" ${COMPILER_EXTRA} "${PARSED_ARGS[@]}" exec zig cc -target "$TARGET" ${COMPILER_EXTRA} "${PARSED_ARGS[@]}"
fi fi