summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Strauss <gstrauss@gluelogic.com>2019-04-26 01:56:35 -0400
committerGlenn Strauss <gstrauss@gluelogic.com>2019-05-04 13:48:22 -0400
commit61e8d799f08419866754eca9b28c726b226a2523 (patch)
tree5b6c2f387bcde195390db834361833201a7c6868
parent338c73fd28bf3fbed831b624f2345af02355b329 (diff)
downloadlighttpd1.4-61e8d799f08419866754eca9b28c726b226a2523.tar.gz
lighttpd1.4-61e8d799f08419866754eca9b28c726b226a2523.zip
[scons] adjustment for static build under CentOS
x-ref: "Trying to compile under CentOS 6.10" https://redmine.lighttpd.net/boards/2/topics/8572
-rw-r--r--src/SConscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/SConscript b/src/SConscript
index d03831e3..003a377f 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -259,7 +259,8 @@ 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')
+ if 'pthread' in fullstatic_libs:
+ fullstatic_libs.remove('pthread')
if 'gcc_s' in fullstatic_libs:
fullstatic_linkflags += ['-static-libgcc']
fullstatic_libs.remove('gcc_s')