Skip to content

Commit f444131

Browse files
authored
Merge pull request #260 from patrick-wolfram/fix/library-linking-order
Library linking order
2 parents d68ccde + 7f49f69 commit f444131

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

robotpy_build/wrapper.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -307,15 +307,17 @@ def _all_library_dirs(self):
307307
return libs
308308

309309
def _all_library_names(self):
310-
libs = list(
311-
set(self.get_library_names()) | set(self.get_dlopen_library_names())
312-
)
310+
libs = []
311+
[libs.append(lib) for lib in self.get_library_names() if lib not in libs]
312+
[libs.append(lib) for lib in self.get_dlopen_library_names() if lib not in libs]
313+
dep_libs = []
313314
for dep in self.cfg.depends:
314315
pkg = self.pkgcfg.get_pkg(dep)
315316
libnames = pkg.get_library_names()
316317
if libnames:
317-
libs.extend(libnames)
318-
return list(reversed(libs))
318+
[dep_libs.append(lib) for lib in libnames if lib not in libs]
319+
libs.extend(reversed(dep_libs))
320+
return libs
319321

320322
def _all_extra_objects(self):
321323
libs = []

0 commit comments

Comments
 (0)