src/mdw-cross.in: Add the cross-built libraries to the runtime search path.

[mdw-cross] / src / crosstool.in

diff --git a/src/crosstool.in b/src/crosstool.in
index bf9a221..001f5e2 100644 (file)
--- a/src/crosstool.in
+++ b/src/crosstool.in
@@ -1,10 +1,21 @@
 #! /bin/sh -e
 
 tool=${0##*/cross-}
+case $tool,${CROSS_COMPILER-gcc} in
+  cc,gcc) tool=gcc ;;
+  c++,gcc) tool=g++ ;;
+  cc,clang) tool=clang ;;
+  c++,clang) tool=clang++ ;;
+esac
 xtool=$(printf %s "$tool" | tr -c a-zA-Z0-9 x)
 eval flags=\$CROSS_${xtool}_FLAGS
 
 case ${CROSS_NATIVE_P-nil} in
-  t) exec $CROSS_COMPILER_PREFIX $tool $flags "$@" ;;
-  nil) exec $CROSS_COMPILER_PREFIX $CROSS_ARCH-$tool $flags "$@" ;;
+  t)
+    exec $CROSS_COMPILER_PREFIX$tool $flags "$@"
+    ;;
+  nil)
+    eval crosstool=\${CROSS_${xtool}_TOOL-\$CROSS_ARCH-\$tool}
+    exec $CROSS_COMPILER_PREFIX$crosstool $flags "$@"
+    ;;
 esac