Alexandre Julliard : makefiles: Don't try to link a library to itself.

Alexandre Julliard julliard at winehq.org
Mon Oct 25 16:30:06 CDT 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Oct 25 11:04:11 2021 +0200

makefiles: Don't try to link a library to itself.

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

---

 tools/makedep.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/makedep.c b/tools/makedep.c
index a7a7924a20b..3792a2b223b 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2050,10 +2050,16 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s
             const char *name = all_libs.str[i] + 2;
 
             for (j = 0; j < subdirs.count; j++)
+            {
+                if (make == submakes[j]) continue;
                 if ((lib = get_static_lib( submakes[j], name ))) break;
+            }
             if (!lib && make->native_unix_lib)
                 for (j = 0; j < subdirs.count; j++)
+                {
+                    if (make == submakes[j]) continue;
                     if ((lib = get_native_unix_lib( submakes[j], name ))) break;
+                }
         }
 
         if (lib)




More information about the wine-cvs mailing list