2012-06-10 17:07:46 +00:00
--- a/src/mklibs
+++ b/src/mklibs
2013-06-05 00:21:23 +00:00
@@ -106,14 +106,14 @@ def library_depends(obj):
2009-09-20 12:51:48 +00:00
# Return a list of libraries the passed objects depend on. The
# libraries are in "-lfoo" format suitable for passing to gcc.
-def library_depends_gcc_libnames(obj):
+def library_depends_gcc_libnames(obj, soname):
if not os.access(obj, os.F_OK):
2012-06-10 17:07:46 +00:00
raise Exception("Cannot find lib: " + obj)
2009-09-20 12:51:48 +00:00
libs = library_depends(obj)
ret = []
for i in libs:
match = re.match("^(((?P<ld>ld\S*)|(lib(?P<lib>\S+))))\.so.*$", i)
- if match:
+ if match and not soname in ("libpthread.so.0"):
if match.group('ld'):
ret.append(find_lib(match.group(0)))
elif match.group('lib'):
2019-07-26 21:45:47 +00:00
@@ -628,7 +628,7 @@ while 1:
2009-09-20 12:51:48 +00:00
cmd.extend(extra_flags)
cmd.append("-lgcc")
cmd.extend(["-L%s" % a for a in [dest_path] + [sysroot + b for b in lib_path if sysroot == "" or b not in ("/" + libdir + "/", "/usr/" + libdir + "/")]])
- cmd.append(library_depends_gcc_libnames(so_file))
+ cmd.append(library_depends_gcc_libnames(so_file, soname))
command(target + "gcc", *cmd)
## DEBUG