src/crosstool.in: Don't establish `$crosstool' if we don't need it.
authorMark Wooding <mdw@distorted.org.uk>
Wed, 22 Apr 2020 21:38:56 +0000 (22:38 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 22 Apr 2020 21:39:55 +0000 (22:39 +0100)
The code ends up longer, but it's less confusing this way.

src/crosstool.in

index 23fdecd..955358d 100644 (file)
@@ -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