Alexandre Julliard : configure: Set the target flags from the --host option even if cross-compiling is not detected .

Alexandre Julliard julliard at winehq.org
Thu Feb 12 11:14:39 CST 2009


Module: wine
Branch: master
Commit: 0fea4a5037b547b1077a6d03b08e98a301abefc4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0fea4a5037b547b1077a6d03b08e98a301abefc4

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Feb 12 10:28:23 2009 +0100

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 b4fd46f..fa79111 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 34650c8..57ec39d 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




More information about the wine-cvs mailing list