Alexandre Julliard : winegcc: Don't build the .spec.o file for native Unix libraries.

Alexandre Julliard julliard at winehq.org
Wed Aug 11 16:42:16 CDT 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Aug 11 11:59:26 2021 +0200

winegcc: Don't build the .spec.o file for native Unix libraries.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/winegcc/winegcc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index b756c5a97f8..8e77648ac10 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -1220,7 +1220,7 @@ static void build(struct options* opts)
     strarray *lib_dirs, *files;
     strarray *link_args, *implib_args, *tool;
     char *output_file, *output_path;
-    const char *spec_o_name, *libgcc = NULL;
+    const char *spec_o_name = NULL, *libgcc = NULL;
     const char *output_name, *spec_file, *lang;
     int generate_app_loader = 1;
     const char *crt_lib = NULL, *entry_point = NULL;
@@ -1382,7 +1382,8 @@ static void build(struct options* opts)
     else entry_point = opts->entry_point;
 
     /* run winebuild to generate the .spec.o file */
-    spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point );
+    if (!(opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "native")))
+        spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point );
 
     if (fake_module) return;  /* nothing else to do */
 
@@ -1414,7 +1415,7 @@ static void build(struct options* opts)
                                             entry_point));
     }
 
-    strarray_add(link_args, spec_o_name);
+    if (spec_o_name) strarray_add(link_args, spec_o_name);
 
     if (is_pe)
     {




More information about the wine-cvs mailing list