blob: d201821fc6bfa2b3fe8608b81c5e6ec6e20c1b4b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- a/src/mklibs.py
+++ b/src/mklibs.py
@@ -112,11 +112,8 @@ def library_depends_gcc_libnames(obj, so
ret = []
for i in libs:
match = re.match("^(((?P<ld>ld\S*)|(lib(?P<lib>\S+))))\.so.*$", i)
- if match and not soname in ("libpthread.so.0"):
- if match.group('ld'):
- ret.append(find_lib(match.group(0)))
- elif match.group('lib'):
- ret.append('-l%s' % match.group('lib'))
+ if match:
+ ret.append(find_lib(match.group(0)))
return ' '.join(ret)
class Symbol(object):
@@ -560,6 +557,7 @@ while 1:
extra_flags = []
extra_pre_obj = []
extra_post_obj = []
+ libgcc_link = find_lib("libgcc_s.so.1")
symbols.update(library_symbols_used[library])
@@ -590,9 +588,11 @@ while 1:
cmd.append(pic_file)
cmd.extend(extra_post_obj)
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, soname))
+ if soname != "libgcc_s.so.1" and soname != "libc.so.0":
+ cmd.append(library_depends_gcc_libnames(so_file, soname))
+ if soname != "libgcc_s.so.1":
+ cmd.append(libgcc_link)
command(target + "gcc", *cmd)
## DEBUG
|
