summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2011-09-04 22:54:24 +0200
committerBert Belder <bertbelder@gmail.com>2011-09-04 22:54:24 +0200
commit3742aeea4c6b0b18491cc80f940be28dfd301492 (patch)
tree8de82b5bb1944530675d188eef24cb48bff952f1 /wscript
parentc82ab45ee6deab6b87dad0c6d08766417280952d (diff)
downloadandroid-node-v8-3742aeea4c6b0b18491cc80f940be28dfd301492.tar.gz
android-node-v8-3742aeea4c6b0b18491cc80f940be28dfd301492.tar.bz2
android-node-v8-3742aeea4c6b0b18491cc80f940be28dfd301492.zip
resolve mingw32 build problem
Diffstat (limited to 'wscript')
-rw-r--r--wscript5
1 files changed, 4 insertions, 1 deletions
diff --git a/wscript b/wscript
index aab08b2383..06b4cfb63a 100644
--- 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');