Rearrange everything.

[mdw-cross] / bin / mdw-cross

diff --git a/bin/mdw-cross b/bin/mdw-cross
index 61c2456..16ba6f7 100755 (executable)
--- a/bin/mdw-cross
+++ b/bin/mdw-cross
@@ -29,10 +29,37 @@ if ! [ -f "$CROSSDIR/etc/$env-setup.sh" ]; then
   echo 2>&1 "${0##*/}: cross environment \`$env' unknown"; exit 2
 fi
 
+p=$PATH CROSS_COMPILER_PREFIX=""
+while :; do
+  case $p in
+    "") break ;;
+    *:*) d=${p%%:*} p=${p#*:} ;;
+    *) d=$p p="" ;;
+  esac
+  if [ -e "$d/ccache" ]; then CROSS_COMPILER_PREFIX="ccache "; break; fi
+done
+export CROSS_COMPILER_PREFIX
+
 MDW_BUILDENV=$env; export MDW_BUILDENV
-if [ -f "$CROSSDIR/etc/$env-config.site" ]; then
-  CONFIG_SITE=$CROSSDIR/etc/$env-config.site; export CONFIG_SITE
+
+if [ -f "$CROSSDIR/etc/$env-config.site" ]
+then CONFIG_SITE=$CROSSDIR/etc/$env-config.site
+else CONFIG_SITE=$CROSSDIR/etc/common-cross-config.site
 fi
+export CONFIG_SITE
+
 CROSS_PREFIX=$CROSSDIR/inst.$env; export CROSS_PREFIX
 . "$CROSSDIR/etc/$env-setup.sh"
+
+case ${CROSS_ARCH+t} in
+  t) ;;
+  *) echo 2>&1 "${0##*/}: setup script didn't set \`CROSS_ARCH'"; exit 2 ;;
+esac
+export CROSS_ARCH
+
+case :$PATH: in
+  *:"$CROSSDIR/tools:"*) ;;
+  *) PATH=$CROSSDIR/tools:$PATH ;;
+esac
+
 exec "$@"