[gimp/wip/Jehan/fix-jpexl-deps] Oups!




commit 0d7ad5cd408e3a883581ba943f6ace842a050f30
Author: Jehan <jehan girinstud io>
Date:   Mon Oct 4 18:18:23 2021 +0200

    Oups!

 build/windows/gitlab-ci/dll_link.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/build/windows/gitlab-ci/dll_link.py b/build/windows/gitlab-ci/dll_link.py
index 6614d3f7fd..685667c5d1 100755
--- a/build/windows/gitlab-ci/dll_link.py
+++ b/build/windows/gitlab-ci/dll_link.py
@@ -68,8 +68,8 @@ def find_dependencies(obj, srcdirs):
   if not os.path.isabs(obj):
     for srcdir in srcdirs:
       abs_dll = os.path.join(srcdir, bindir, obj)
+      abs_dll = os.path.abspath(abs_dll)
       if find_dependencies(abs_dll, srcdirs):
-        dlls.add(abs_dll)
         return True
     else:
       # Found in none of the srcdirs: consider it a system DLL
@@ -103,6 +103,7 @@ def find_dependencies(obj, srcdirs):
     for match in re.finditer(r"DLL Name: *(\S+.dll)", out, re.MULTILINE):
       dll = match.group(1)
       if dll not in dlls:
+        dlls.add(dll)
         find_dependencies(dll, srcdirs)
 
     return True


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]