summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan B├╝hler <stbuehler@web.de>2017-10-24 12:32:23 +0200
committerGlenn Strauss <gstrauss@gluelogic.com>2017-10-28 22:41:32 -0400
commit68a92f2c3c9a496b2ae1fb19e7443f2232a6bb8e (patch)
treeae5e2bda6bcaac26f27c854df7444ae4e2c57d2f
parentb8989bf2dd0a254c3df706296e51d3fd2f971402 (diff)
downloadlighttpd1.4-68a92f2c3c9a496b2ae1fb19e7443f2232a6bb8e.tar.gz
lighttpd1.4-68a92f2c3c9a496b2ae1fb19e7443f2232a6bb8e.zip
[scons] don't link pthread twice in --whole-archive workaround
-rw-r--r--src/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/SConscript b/src/SConscript
index b9c9537a..3e0c2e83 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -244,6 +244,7 @@ fullstatic_libs = GatherLibs(env, fullstaticlib)
fullstatic_linkflags = [staticenv['LINKFLAGS'], '-static']
if (('pthread' in fullstatic_libs) or ('pcre' in fullstatic_libs)) and (platform.system() == 'Linux'):
fullstatic_linkflags += ['-Wl,--whole-archive','-lpthread','-Wl,--no-whole-archive']
+ fullstatic_libs.remove('pthread')
## includes all modules, linked statically
fullstaticbin = staticenv.Program('../fullstatic/build/lighttpd',