Skip to content

Commit 260b8b6

Browse files
committed
fixup! avoid adding libraries if shared is unset
1 parent d1af3c5 commit 260b8b6

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

configure

+7-4
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,8 @@ def configure_node(o):
632632
def configure_libz(o):
633633
o['variables']['node_shared_zlib'] = b(options.shared_zlib)
634634

635-
o['libraries'] += ['-l%s' % options.shared_zlib_libname]
635+
if b(options.shared_zlib) == True:
636+
o['libraries'] += ['-l%s' % options.shared_zlib_libname]
636637
if options.shared_zlib_libpath:
637638
o['libraries'] += ['-L%s' % options.shared_zlib_libpath]
638639
if options.shared_zlib_includes:
@@ -641,8 +642,9 @@ def configure_libz(o):
641642

642643
def configure_http_parser(o):
643644
o['variables']['node_shared_http_parser'] = b(options.shared_http_parser)
644-
645-
o['libraries'] += ['-l%s' % options.shared_http_parser_libname]
645+
646+
if b(options.shared_http_parser) == True:
647+
o['libraries'] += ['-l%s' % options.shared_http_parser_libname]
646648
if options.shared_http_parser_libpath:
647649
o['libraries'] += ['-L%s' % options.shared_http_parser_libpath]
648650
if options.shared_http_parser_includes:
@@ -652,7 +654,8 @@ def configure_http_parser(o):
652654
def configure_libuv(o):
653655
o['variables']['node_shared_libuv'] = b(options.shared_libuv)
654656

655-
o['libraries'] += ['-l%s' % options.shared_libuv_libname]
657+
if b(options.shared_libuv) == True:
658+
o['libraries'] += ['-l%s' % options.shared_libuv_libname]
656659
if options.shared_libuv_libpath:
657660
o['libraries'] += ['-L%s' % options.shared_libuv_libpath]
658661
else:

0 commit comments

Comments
 (0)