Commit 66687c0
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -884,26 +884,26 @@ def configure_library(lib, output): | |||
| 884 | 884 | if getattr(options, shared_lib): | |
| 885 | 885 | (pkg_libs, pkg_cflags, pkg_libpath) = pkg_config(lib) | |
| 886 | 886 | ||
| 887 | - if pkg_cflags: | ||
| 887 | + if options.__dict__[shared_lib + '_includes']: | ||
| 888 | + output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] | ||
| 889 | + elif pkg_cflags: | ||
| 888 | 890 | output['include_dirs'] += ( | |
| 889 | 891 | filter(None, map(str.strip, pkg_cflags.split('-I')))) | |
| 890 | - elif options.__dict__[shared_lib + '_includes']: | ||
| 891 | - output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] | ||
| 892 | 892 | ||
| 893 | 893 | # libpath needs to be provided ahead libraries | |
| 894 | - if pkg_libpath: | ||
| 895 | - output['libraries'] += [pkg_libpath] | ||
| 896 | - elif options.__dict__[shared_lib + '_libpath']: | ||
| 894 | + if options.__dict__[shared_lib + '_libpath']: | ||
| 897 | 895 | output['libraries'] += [ | |
| 898 | 896 | '-L%s' % options.__dict__[shared_lib + '_libpath']] | |
| 897 | + elif pkg_libpath: | ||
| 898 | + output['libraries'] += [pkg_libpath] | ||
| 899 | 899 | ||
| 900 | 900 | default_libs = getattr(options, shared_lib + '_libname') | |
| 901 | 901 | default_libs = map('-l{0}'.format, default_libs.split(',')) | |
| 902 | 902 | ||
| 903 | - if pkg_libs: | ||
| 904 | - output['libraries'] += pkg_libs.split() | ||
| 905 | - elif default_libs: | ||
| 903 | + if default_libs: | ||
| 906 | 904 | output['libraries'] += default_libs | |
| 905 | + elif pkg_libs: | ||
| 906 | + output['libraries'] += pkg_libs.split() | ||
| 907 | 907 | ||
| 908 | 908 | ||
| 909 | 909 | def configure_v8(o): | |
0 commit comments