Skip to content

Commit fcb06af

Browse files
zyxarrvagg
authored andcommitted
build: fix configuring with prebuilt libraries
Fix configure_library() to produce correct LDFLAGS when configuring with prebuilt 3rd-party libraries (libuv, openssl, etc) using `pkg-config' or `--shared-{LIBRARY}-includes=xxx --shared-{LIBRARY}-libpath=xxx'. PR-URL: #3135 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Johan Bergström <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]>
1 parent ab37375 commit fcb06af

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

configure

+6-2
Original file line numberDiff line numberDiff line change
@@ -749,11 +749,15 @@ def configure_library(lib, output):
749749
if pkg_cflags:
750750
output['include_dirs'] += (
751751
filter(None, map(str.strip, pkg_cflags.split('-I'))))
752+
elif options.__dict__[shared_lib + '_includes']:
753+
output['include_dirs'] += [options.__dict__[shared_lib + '_includes']]
752754

753755
# libpath needs to be provided ahead libraries
754756
if pkg_libpath:
755-
output['libraries'] += (
756-
filter(None, map(str.strip, pkg_cflags.split('-L'))))
757+
output['libraries'] += [pkg_libpath]
758+
elif options.__dict__[shared_lib + '_libpath']:
759+
output['libraries'] += [
760+
'-L%s' % options.__dict__[shared_lib + '_libpath']]
757761

758762
default_libs = getattr(options, shared_lib + '_libname')
759763
default_libs = map('-l{0}'.format, default_libs.split(','))

0 commit comments

Comments
 (0)