From a058409829210afa3d3cf929fa54dc8edf72a626 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Wed, 4 Sep 2019 00:16:46 -0400 Subject: [PATCH] Fix static compilation (probably, just like last time I didn't test this) --- SConscript | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/SConscript b/SConscript index b5c047603..a7a443284 100644 --- a/SConscript +++ b/SConscript @@ -328,14 +328,15 @@ def findLibs(env, conf): FatalError("libz not found or not installed") #Look for libcurl - if not GetOption('nohttp') and not GetOption('renderer') and not conf.CheckLib(['curl', 'libcurl']): + useCurl = not GetOption('nohttp') and not GetOption('renderer') + if useCurl and not conf.CheckLib(['curl', 'libcurl']): FatalError("libcurl not found or not installed") - if platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD": - if GetOption('static'): - env.ParseConfig("curl-config --static-libs") - else: - env.ParseConfig("curl-config --libs") + if useCurl and (platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD"): + if GetOption('static'): + env.ParseConfig("curl-config --static-libs") + else: + env.ParseConfig("curl-config --libs") #Look for pthreads if not conf.CheckLib(['pthread', 'pthreadVC2']):