Jacek Caban : makedep: Use -mno-cygwin for linking modules with no sources.
Alexandre Julliard
julliard at winehq.org
Tue Feb 11 15:44:56 CST 2020
Module: wine
Branch: master
Commit: a592c1ed08f7c8211cd58e0c0a0d4865ed5af256
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a592c1ed08f7c8211cd58e0c0a0d4865ed5af256
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Feb 11 12:46:46 2020 +0100
makedep: Use -mno-cygwin for linking modules with no sources.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tools/makedep.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tools/makedep.c b/tools/makedep.c
index a819cffca9..1d9a1b5a59 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -4253,10 +4253,16 @@ static void load_sources( struct makefile *make )
add_generated_sources( make );
+ if (!make->use_msvcrt && !has_object_file( make ))
+ {
+ strarray_add( &make->extradllflags, "-mno-cygwin" );
+ make->use_msvcrt = 1;
+ }
+
LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 );
LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file );
- if (crosstarget) make->is_cross = (make->testdll || make->use_msvcrt || !has_object_file( make ));
+ make->is_cross = crosstarget && make->use_msvcrt;
if (make->is_cross)
{
More information about the wine-cvs
mailing list