aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormakise-homura <akemi_homura@kurisa.ch>2019-10-17 20:13:41 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2019-10-19 14:27:41 +0300
commitdd8c1d059514dea820c2e952a3c01a50993d4ec3 (patch)
tree879516a7dd976cd449b9c0110685dae770b2b836
parentd5be103585ce992e73efd4fa4e47476a3292906f (diff)
downloadmeson-dd8c1d059514dea820c2e952a3c01a50993d4ec3.zip
meson-dd8c1d059514dea820c2e952a3c01a50993d4ec3.tar.gz
meson-dd8c1d059514dea820c2e952a3c01a50993d4ec3.tar.bz2
Make search of library dirs correct
-rw-r--r--mesonbuild/compilers/mixins/elbrus.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/mixins/elbrus.py b/mesonbuild/compilers/mixins/elbrus.py
index 599d92a..03f6556 100644
--- a/mesonbuild/compilers/mixins/elbrus.py
+++ b/mesonbuild/compilers/mixins/elbrus.py
@@ -42,9 +42,9 @@ class ElbrusCompiler(GnuCompiler):
stdo = Popen_safe(self.exelist + ['--print-search-dirs'], env=os_env)[1]
for line in stdo.split('\n'):
if line.startswith('libraries:'):
- # lcc does not include '=' in --print-search-dirs output.
+ # lcc does not include '=' in --print-search-dirs output. Also it could show nonexistent dirs.
libstr = line.split(' ', 1)[1]
- return [os.path.realpath(p) for p in libstr.split(':')]
+ return [os.path.realpath(p) for p in libstr.split(':') if os.path.exists(p)]
return []
def get_program_dirs(self, env: 'Environment') -> typing.List[str]: