From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 22 Apr 2020 21:38:56 +0000 (+0100)
Subject: src/crosstool.in: Don't establish `$crosstool' if we don't need it.
X-Git-Url: https://git.distorted.org.uk/~mdw/mdw-cross/commitdiff_plain/b6a56709f8b0d731eb21b298cb3183bba98f4cfc

src/crosstool.in: Don't establish `$crosstool' if we don't need it.

The code ends up longer, but it's less confusing this way.
---

diff --git a/src/crosstool.in b/src/crosstool.in
index 23fdecd..955358d 100644
--- a/src/crosstool.in
+++ b/src/crosstool.in
@@ -3,9 +3,13 @@
 tool=${0##*/cross-}
 xtool=$(printf %s "$tool" | tr -c a-zA-Z0-9 x)
 eval flags=\$CROSS_${xtool}_FLAGS
-eval crosstool=\${CROSS_${xtool}_TOOL-\$CROSS_ARCH-\$tool}
 
 case ${CROSS_NATIVE_P-nil} in
-  t) exec $CROSS_COMPILER_PREFIX $tool $flags "$@" ;;
-  nil) exec $CROSS_COMPILER_PREFIX $crosstool $flags "$@" ;;
+  t)
+    exec $CROSS_COMPILER_PREFIX$tool $flags "$@"
+    ;;
+  nil)
+    eval crosstool=\${CROSS_${xtool}_TOOL-\$CROSS_ARCH-\$tool}
+    exec $CROSS_COMPILER_PREFIX$crosstool $flags "$@"
+    ;;
 esac