resolve mingw32 build problem

diff --git a/wscript b/wscript
index aab08b238341043d1a1733162f3b84db09f0ce18..06b4cfb63a93f41b4b75238e36dd3708f3287812 100644 (file)
--- a/wscript
+++ b/wscript
@@ -492,8 +492,11 @@ def configure(conf):
 
   if sys.platform.startswith("win32"):
     conf.env.append_value('LIB', 'psapi')
-    conf.env.append_value('LIB', 'ws2_32')
     conf.env.append_value('LIB', 'winmm')
+    # This enforces ws2_32 to be linked after crypto, otherwise the linker
+    # will run into undefined references from libcrypto.a
+    if not Options.options.use_openssl:
+      conf.env.append_value('LIB', 'ws2_32')
 
   conf.env.append_value('CPPFLAGS', '-Wno-unused-parameter');
   conf.env.append_value('CPPFLAGS', '-D_FORTIFY_SOURCE=2');