diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-22 21:54:07 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-22 21:54:07 +0300 |
| commit | 60c1bacfaad1ff74e48529e3b99618fb4f4c9072 (patch) | |
| tree | 4bbce1eafc517b689af0458d76aadf51a47fdd27 | |
| parent | 85972c848d477dda125f947ecb8b3988b0a2ff50 (diff) | |
| download | meson-60c1bacfaad1ff74e48529e3b99618fb4f4c9072.zip meson-60c1bacfaad1ff74e48529e3b99618fb4f4c9072.tar.gz meson-60c1bacfaad1ff74e48529e3b99618fb4f4c9072.tar.bz2 | |
Added some Fedora paths to library directory list.
| -rw-r--r-- | dependencies.py | 2 | ||||
| -rw-r--r-- | environment.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/dependencies.py b/dependencies.py index 31ea889..750bfc5 100644 --- a/dependencies.py +++ b/dependencies.py @@ -161,7 +161,7 @@ class ExternalLibrary(Dependency): if self.found(): mlog.log('Library', mlog.bold(name), 'found:', mlog.green('YES'), '(%s)' % self.fullpath) else: - mlog.log('Library', mlog.bold(name), 'found:,', mlog.red('NO')) + mlog.log('Library', mlog.bold(name), 'found:', mlog.red('NO')) def found(self): return self.fullpath is not None diff --git a/environment.py b/environment.py index d75a938..a62a4a6 100644 --- a/environment.py +++ b/environment.py @@ -1518,6 +1518,11 @@ def get_library_dirs(): if plat == 'i686': plat = 'i386' unixdirs += glob('/usr/lib/' + plat + '*') + if os.path.exists('/usr/lib64'): + unixdirs.append('/usr/lib64') + unixdirs += glob('/lib/' + plat + '*') + if os.path.exists('/lib64'): + unixdirs.append('/lib64') unixdirs += glob('/lib/' + plat + '*') unixdirs.append('/usr/local/lib') return unixdirs |