Alexandre Julliard : makefiles: Don't implicitly import the module itself when -nodefaultlibs is used.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Aug 24 13:30:12 2020 +0200

makefiles: Don't implicitly import the module itself when -nodefaultlibs is used.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

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

diff --git a/tools/makedep.c b/tools/makedep.c
index 825458156f..4bd20d469d 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2212,7 +2212,11 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra
         const char *lib = NULL;
 
         /* skip module's own importlib, its object files will be linked directly */
-        if (make->importlib && !is_unix && !strcmp( make->importlib, imports.str[i] )) continue;
+        if (make->importlib && !strcmp( make->importlib, imports.str[i] ))
+        {
+            if (!is_unix) continue;
+            if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) continue;
+        }
 
         for (j = 0; j < top_makefile->subdirs.count; j++)
         {