makefiles: Always build the static cross libraries if crosstest is supported.
diff --git a/configure b/configure
index 437fb20..4e20726 100755
--- a/configure
+++ b/configure
@@ -646,8 +646,8 @@
XMKMF
LIBPTHREAD
CROSSTARGET
-CROSSTEST
CROSSCC
+CROSSTEST_DISABLE
CARBONLIB
FRAMEWORK_OPENAL
COREAUDIO
@@ -6997,7 +6997,9 @@
" "$LINENO" 5
fi
-if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll"
+CROSSTEST_DISABLE=\#
+
+if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll"
then
case "$host_cpu" in
i[3456789]86*)
@@ -7052,8 +7054,7 @@
if test "$CROSSCC" != "false"
then
- CROSSTEST="\$(CROSSTEST)"
-
+ CROSSTEST_DISABLE=""
set x $CROSSCC
shift
target=""
@@ -14074,12 +14075,8 @@
wine_fn_all_dir_rules $ac_dir "dlls/Makeimplib.rules \$(MAKEDEP)"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all __builddeps__: $ac_dir
-__buildcrossdeps__: $ac_dir/lib$ac_name.cross.a
-$ac_dir $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include
-$ac_dir: dummy
+$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@cd $ac_dir && \$(MAKE)
-$ac_dir/lib$ac_name.cross.a: dummy
- @cd $ac_dir && \$(MAKE) lib$ac_name.cross.a
install install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install
uninstall:: $ac_dir/Makefile
