Skip to content

Commit 1048abf

Browse files
Merge pull request #2683 from fpoli/fix-static-linking
Link pthread using the --whole-archive option
2 parents c181f89 + ac60269 commit 1048abf

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/mk_util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2631,10 +2631,10 @@ def mk_config():
26312631
config.write('LINK=%s\n' % CXX)
26322632
config.write('LINK_FLAGS=\n')
26332633
config.write('LINK_OUT_FLAG=-o \n')
2634-
if build_static_lib() or build_static_bin():
2634+
if is_linux() and (build_static_lib() or build_static_bin()):
26352635
config.write('LINK_EXTRA_FLAGS=-Wl,--whole-archive -lpthread -Wl,--no-whole-archive %s\n' % LDFLAGS)
26362636
else:
2637-
config.write('LINK_EXTRA_FLAGS= -lpthread %s\n' % LDFLAGS)
2637+
config.write('LINK_EXTRA_FLAGS=-lpthread %s\n' % LDFLAGS)
26382638
config.write('SO_EXT=%s\n' % SO_EXT)
26392639
config.write('SLINK=%s\n' % CXX)
26402640
config.write('SLINK_FLAGS=%s\n' % SLIBFLAGS)

0 commit comments

Comments
 (0)