fixup! avoid adding libraries if shared is unset

nodejs · Apr 3, 2015 · 260b8b6 · 260b8b6
1 parent d1af3c5
commit 260b8b6
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/configure b/configure
@@ -632,7 +632,8 @@ def configure_node(o):
 def configure_libz(o):
   o['variables']['node_shared_zlib'] = b(options.shared_zlib)
 
-  o['libraries'] += ['-l%s' % options.shared_zlib_libname]
+  if b(options.shared_zlib) == True:
+    o['libraries'] += ['-l%s' % options.shared_zlib_libname]
   if options.shared_zlib_libpath:
     o['libraries'] += ['-L%s' % options.shared_zlib_libpath]
   if options.shared_zlib_includes:
@@ -641,8 +642,9 @@ def configure_libz(o):
 
 def configure_http_parser(o):
     o['variables']['node_shared_http_parser'] = b(options.shared_http_parser)
-
-    o['libraries'] += ['-l%s' % options.shared_http_parser_libname]
+
+    if b(options.shared_http_parser) == True:
+      o['libraries'] += ['-l%s' % options.shared_http_parser_libname]
     if options.shared_http_parser_libpath:
         o['libraries'] += ['-L%s' % options.shared_http_parser_libpath]
     if options.shared_http_parser_includes:
@@ -652,7 +654,8 @@ def configure_http_parser(o):
 def configure_libuv(o):
   o['variables']['node_shared_libuv'] = b(options.shared_libuv)
 
-  o['libraries'] += ['-l%s' % options.shared_libuv_libname]
+  if b(options.shared_libuv) == True:
+    o['libraries'] += ['-l%s' % options.shared_libuv_libname]
   if options.shared_libuv_libpath:
     o['libraries'] += ['-L%s' % options.shared_libuv_libpath]
   else: