Commit 54f2ce8
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -843,26 +843,26 @@ def configure_library(lib, output): | |||
| 843 | 843 | if getattr(options, shared_lib): | |
| 844 | 844 | (pkg_libs, pkg_cflags, pkg_libpath) = pkg_config(lib) | |
| 845 | 845 | ||
| 846 | - if pkg_cflags: | ||
| 846 | + if options.__dict__[shared_lib + '_includes']: | ||
| 847 | + output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] | ||
| 848 | + elif pkg_cflags: | ||
| 847 | 849 | output['include_dirs'] += ( | |
| 848 | 850 | filter(None, map(str.strip, pkg_cflags.split('-I')))) | |
| 849 | - elif options.__dict__[shared_lib + '_includes']: | ||
| 850 | - output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] | ||
| 851 | 851 | ||
| 852 | 852 | # libpath needs to be provided ahead libraries | |
| 853 | - if pkg_libpath: | ||
| 854 | - output['libraries'] += [pkg_libpath] | ||
| 855 | - elif options.__dict__[shared_lib + '_libpath']: | ||
| 853 | + if options.__dict__[shared_lib + '_libpath']: | ||
| 856 | 854 | output['libraries'] += [ | |
| 857 | 855 | '-L%s' % options.__dict__[shared_lib + '_libpath']] | |
| 856 | + elif pkg_libpath: | ||
| 857 | + output['libraries'] += [pkg_libpath] | ||
| 858 | 858 | ||
| 859 | 859 | default_libs = getattr(options, shared_lib + '_libname') | |
| 860 | 860 | default_libs = map('-l{0}'.format, default_libs.split(',')) | |
| 861 | 861 | ||
| 862 | - if pkg_libs: | ||
| 863 | - output['libraries'] += pkg_libs.split() | ||
| 864 | - elif default_libs: | ||
| 862 | + if default_libs: | ||
| 865 | 863 | output['libraries'] += default_libs | |
| 864 | + elif pkg_libs: | ||
| 865 | + output['libraries'] += pkg_libs.split() | ||
| 866 | 866 | ||
| 867 | 867 | ||
| 868 | 868 | def configure_v8(o): | |
0 commit comments