summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-08-23 20:54:13 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-08-23 20:54:13 -0300
commit700fdf5c0ca4d8078f3fd8e83a7a53b65f0280e0 (patch)
treee70a744f957183bedbba1df68f8e98a0cb3145d0 /SConstruct
parent4b40f9228bdfe8573a2d70a6cd76404df117c8b9 (diff)
fix build issue with ssl, closes #2384
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct6
1 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index 9cd1da7f45..9cce6edd81 100644
--- a/SConstruct
+++ b/SConstruct
@@ -220,14 +220,14 @@ if selected_platform in platform_list:
env.Append(LINKFLAGS=string.split(str(LINKFLAGS)))
- detect.configure(env)
-
-
flag_list = platform_flags[selected_platform]
for f in flag_list:
if not (f[0] in ARGUMENTS): # allow command line to override platform flags
env[f[0]] = f[1]
+ #must happen after the flags, so when flags are used by configure, stuff happens (ie, ssl on x11)
+ detect.configure(env)
+
#env['platform_libsuffix'] = env['LIBSUFFIX']
suffix="."+selected_platform