Alexandre Julliard : configure: Don' t create cross-compiled import libraries for 16-bit modules.
Alexandre Julliard
julliard at winehq.org
Mon Dec 30 13:05:59 CST 2013
Module: wine
Branch: master
Commit: e48720236a096db328b060da651f8108b1154375
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48720236a096db328b060da651f8108b1154375
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Dec 28 13:37:34 2013 +0100
configure: Don't create cross-compiled import libraries for 16-bit modules.
---
aclocal.m4 | 6 +++---
configure | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 300196b..7760a20 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -471,7 +471,7 @@ $ac_dir/uninstall::
\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT"
fi
- if test -n "$CROSSTARGET"
+ if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
then
wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a
@@ -494,7 +494,7 @@ $ac_dir/uninstall::
\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
install install-dev:: $ac_dir/install-dev
__uninstall__: $ac_dir/uninstall"
- if test -n "$CROSSTARGET"
+ if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
then
wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a
@@ -511,7 +511,7 @@ dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
clean::
\$(RM) dlls/lib$ac_implib.$IMPLIBEXT"
wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT"
- if test -n "$CROSSTARGET"
+ if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
then
wine_fn_append_rule \
"__builddeps__: dlls/lib$ac_implib.cross.a
diff --git a/configure b/configure
index 50d5966..f56f46a 100755
--- a/configure
+++ b/configure
@@ -7344,7 +7344,7 @@ $ac_dir/uninstall::
\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT"
fi
- if test -n "$CROSSTARGET"
+ if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
then
wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a
@@ -7367,7 +7367,7 @@ $ac_dir/uninstall::
\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
install install-dev:: $ac_dir/install-dev
__uninstall__: $ac_dir/uninstall"
- if test -n "$CROSSTARGET"
+ if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
then
wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a
@@ -7384,7 +7384,7 @@ dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
clean::
\$(RM) dlls/lib$ac_implib.$IMPLIBEXT"
wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT"
- if test -n "$CROSSTARGET"
+ if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
then
wine_fn_append_rule \
"__builddeps__: dlls/lib$ac_implib.cross.a
More information about the wine-cvs
mailing list