From 0fea4a5037b547b1077a6d03b08e98a301abefc4 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 12 Feb 2009 10:28:23 +0100
Subject: [PATCH] configure: Set the target flags from the --host option even
 if cross-compiling is not detected.

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

diff --git a/configure b/configure
index b4fd46f3f71..fa7911132ca 100755
--- a/configure
+++ b/configure
@@ -3943,9 +3943,9 @@ fi
 $as_echo "$wine_cv_toolsdir" >&6; }
 TOOLSDIR=$wine_cv_toolsdir
 
-if test "$cross_compiling" = "yes"
+if test -n "$host_alias"
 then
-    TARGETFLAGS="-b $host_alias"
+    TARGETFLAGS="-b $host_alias $TARGETFLAGS"
 
 fi
 
diff --git a/configure.ac b/configure.ac
index 34650c85e96..57ec39d6380 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,9 +169,9 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
      AC_MSG_ERROR([could not find Wine tools in $with_wine_tools.])
    fi])
 AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
-if test "$cross_compiling" = "yes"
+if test -n "$host_alias"
 then
-    AC_SUBST(TARGETFLAGS,"-b $host_alias")
+    AC_SUBST(TARGETFLAGS,"-b $host_alias $TARGETFLAGS")
 fi
 
 dnl Check for flex