Module: wine Branch: master Commit: 72a95ffa22606fb1027385dd7eba647e294ae5ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a95ffa22606fb1027385dd7e... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 14:50:51 2009 +0200 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 1142c59..2ebe28a 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 356f6b7..3ef18dc 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