Alexandre Julliard : winegcc: Remove support for "hybrid" Unix libraries.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f57c8d68bdc4c9f02d03fd65b333ccca0bdc2635
URL:    https://gitlab.winehq.org/wine/wine/-/commit/f57c8d68bdc4c9f02d03fd65b333ccc...

Author: Alexandre Julliard 
Date:   Fri Nov 11 12:07:13 2022 +0100

winegcc: Remove support for "hybrid" Unix libraries.

---

tools/winegcc/winegcc.c      | 23 +++--------------------
 tools/winegcc/winegcc.man.in |  2 --
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index ddd513e55d0..e1efa518925 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -172,7 +172,6 @@ struct options
     int nodefaultlibs;
     int noshortwchar;
     int data_only;
-    int unix_lib;
     int gui_app;
     int unicode_app;
     int win16_app;
@@ -404,7 +403,7 @@ static struct strarray get_link_args( struct options *opts, const char *output_n
     switch (opts->target.platform)
     {
     case PLATFORM_APPLE:
-        strarray_add( &flags, opts->unix_lib ? "-dynamiclib" : "-bundle" );
+        strarray_add( &flags, "-bundle" );
         strarray_add( &flags, "-multiply_defined" );
         strarray_add( &flags, "suppress" );
         if (opts->image_base)
@@ -413,12 +412,6 @@ static struct strarray get_link_args( struct options *opts, const char *output_n
             strarray_add( &flags, opts->image_base );
         }
         if (opts->strip) strarray_add( &flags, "-Wl,-x" );
-        if (opts->unix_lib)
-        {
-            strarray_add( &flags, "-install_name" );
-            strarray_add( &flags, strmake( "@rpath/%s.so", output_name ) );
-            strarray_add( &flags, "-Wl,-rpath,@loader_path/" );
-        }
         strarray_addall( &link_args, flags );
         return link_args;

@@ -522,7 +515,6 @@ static struct strarray get_link_args( struct options *opts, const char *output_n
         }
         if (!try_link( opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000"))
             strarray_add( &flags, "-Wl,-z,max-page-size=0x1000");
-        if (opts->unix_lib) strarray_add( &flags, strmake( "-Wl,-soname,%s.so", output_name ));
         break;
     }

@@ -1262,7 +1254,7 @@ static void build(struct options* opts)
     /* set default entry point, if needed */
     if (!opts->entry_point)
     {
-        if (opts->subsystem && !opts->unix_lib && !strcmp( opts->subsystem, "native" ))
+        if (opts->subsystem && !strcmp( opts->subsystem, "native" ))
             entry_point = (is_pe && opts->target.cpu == CPU_i386) ? "DriverEntry@8" : "DriverEntry";
         else if (opts->use_msvcrt && !opts->shared && !opts->win16_app)
             entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup";
@@ -1275,8 +1267,7 @@ static void build(struct options* opts)
         build_data_lib( opts, spec_file, output_file, files );
         return;
     }
-    if (spec_file || !opts->unix_lib)
-        spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point );
+    spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point );

if (opts->fake_module) return;  /* nothing else to do */

@@ -1414,8 +1405,6 @@ static void build(struct options* opts)
         spawn(opts->prefix, tool, 0);
     }

-    if (opts->unix_lib) return;
-
     if (opts->out_implib && !is_pe)
     {
         struct strarray tool, implib_args;
@@ -1756,12 +1745,6 @@ int main(int argc, char **argv)
                     {
                         raw_compiler_arg = 0;
                     }
-		    else if (strcmp("-munix", opts.args.str[i]) == 0)
-                    {
-			opts.unix_lib = 1;
-                        raw_compiler_arg = 0;
-                        raw_winebuild_arg = 1;
-                    }
    	    else if (strcmp("-m16", opts.args.str[i]) == 0)
                     {
    		opts.win16_app = 1;
diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in
index 87c1496fd18..cb485492bea 100644
--- a/tools/winegcc/winegcc.man.in
+++ b/tools/winegcc/winegcc.man.in
@@ -59,8 +59,6 @@ Set the default entry point of the application to be the Unicode
 This option adds -lgdi32, -lcomdlg32, and -lshell32 to the list of
 default libraries, and passes '--subsystem windows' to winebuild
 to build graphical applications.
-.IP \fB-munix\fR
-Set when building the Unix counterpart of a builtin module.
 .IP \fB-nodefaultlibs\fR
 Do not use the standard system libraries when linking. These
 include at a minimum -lkernel32, -luser32, -ladvapi32, and