From 72a95ffa22606fb1027385dd7eba647e294ae5ab Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 22 Jun 2009 14:50:51 +0200
Subject: [PATCH] configure: Improve extraction of the target name from the
 CROSSCC definition.

---
 configure    | 15 ++++++++++++++-
 configure.ac | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 1142c5934d3..2ebe28ac225 100755
--- a/configure
+++ b/configure
@@ -8366,8 +8366,21 @@ test -n "$MINGWAR" || MINGWAR="false"
     then
         CROSSTEST="\$(CROSSTEST)"
 
-        CROSSTARGETFLAGS="-b `expr $CROSSCC : '\(.*\)-gcc'`"
+        set x $CROSSCC
+        shift
+        target=""
+        while test $# -ge 1
+        do
+            case "$1" in
+              *-gcc) target=`expr "$1" : '\(.*\)-gcc'` ;;
+            esac
+            shift
+        done
+        if test -n "$target"
+        then
+            CROSSTARGETFLAGS="-b $target"
 
+        fi
     fi
 fi
 
diff --git a/configure.ac b/configure.ac
index 356f6b79cd9..3ef18dce05f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -699,7 +699,20 @@ then
     if test "$CROSSCC" != "false"
     then
         AC_SUBST(CROSSTEST,"\$(CROSSTEST)")
-        AC_SUBST(CROSSTARGETFLAGS,"-b `expr $CROSSCC : '\(.*\)-gcc'`")
+        set x $CROSSCC
+        shift
+        target=""
+        while test $# -ge 1
+        do
+            case "$1" in
+              *-gcc) target=`expr "$1" : '\(.*\)-gcc'` ;;
+            esac
+            shift
+        done
+        if test -n "$target"
+        then
+            AC_SUBST(CROSSTARGETFLAGS,"-b $target")
+        fi
     fi
 fi