Alexandre Julliard : winebuild: Support a -mno-cygwin flag.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7933562048d4d93c419a1b9d32427c33148b67d6
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7933562048d4d93c419a1b9d3...

Author: Alexandre Julliard 
Date:   Wed Jul  1 10:36:30 2020 +0200

winebuild: Support a -mno-cygwin flag.

Signed-off-by: Alexandre Julliard

---

tools/winebuild/build.h          | 1 +
 tools/winebuild/import.c         | 2 +-
 tools/winebuild/main.c           | 2 ++
 tools/winebuild/winebuild.man.in | 7 +++++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h
index c162888a03..d0fc3dca1b 100644
--- a/tools/winebuild/build.h
+++ b/tools/winebuild/build.h
@@ -363,6 +363,7 @@ extern int verbose;
 extern int link_ext_symbols;
 extern int force_pointer_size;
 extern int unwind_tables;
+extern int use_msvcrt;
 extern int unix_lib;
 extern int safe_seh;

diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
index 04ab433dd6..616b9842ce 100644
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
@@ -643,7 +643,7 @@ void read_undef_symbols( DLLSPEC *spec, char **argv )
             add_undef_import( p + strlen( import_func_prefix ), 0 );
         else if (!strncmp( p, import_ord_prefix, strlen(import_ord_prefix) ))
             add_undef_import( p + strlen( import_ord_prefix ), 1 );
-        else if (!unix_lib || !find_name( p, &stdc_functions ))
+        else if (use_msvcrt || !find_name( p, &stdc_functions ))
             strarray_add( &undef_symbols, xstrdup( p ), NULL );
     }
     if ((err = pclose( f ))) warning( "%s failed with status %d\n", cmd, err );
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index efb86b705e..c1858a4b4d 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -46,6 +46,7 @@ int verbose = 0;
 int link_ext_symbols = 0;
 int force_pointer_size = 0;
 int unwind_tables = 0;
+int use_msvcrt = 0;
 int unix_lib = 0;
 int safe_seh = 0;

@@ -445,6 +446,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec )
             else if (!strcmp( optarg, "64" )) force_pointer_size = 8;
             else if (!strcmp( optarg, "arm" )) thumb_mode = 0;
             else if (!strcmp( optarg, "thumb" )) thumb_mode = 1;
+            else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1;
             else if (!strcmp( optarg, "unix" )) unix_lib = 1;
             else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 );
             else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 );
diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in
index 63ea2a3226..109f3824f1 100644
--- a/tools/winebuild/winebuild.man.in
+++ b/tools/winebuild/winebuild.man.in
@@ -177,9 +177,12 @@ Generate respectively 16-bit, 32-bit or 64-bit code.
 .BI -marm,\ -mthumb,\ -march= option ,\ -mcpu= option ,\ -mfpu= option ,\ -mfloat-abi= option
 Set code generation options for the assembler.
 .TP
+.B -mno-cygwin
+Build a library that uses the Windows runtime instead of the Unix C
+library.
+.TP
 .B -munix
-Build a library that imports standard functions from the Unix C
-library instead of the Windows runtime.
+Build the Unix counterpart of a builtin module.
 .TP
 .BI -M,\ --main-module= module
 When building a 16-bit dll, set the name of its 32-bit counterpart to