diff options
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/c.py | 27 | ||||
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 18 |
2 files changed, 41 insertions, 4 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 4cc9660..354124a 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -45,6 +45,7 @@ from .compilers import ( class CCompiler(Compiler): library_dirs_cache = {} + program_dirs_cache = {} def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwargs): # If a child ObjC or CPP class has already set it, don't set it ourselves @@ -166,11 +167,12 @@ class CCompiler(Compiler): env = os.environ.copy() env['LC_ALL'] = 'C' stdo = Popen_safe(self.exelist + ['--print-search-dirs'], env=env)[1] + paths = [] for line in stdo.split('\n'): if line.startswith('libraries:'): libstr = line.split('=', 1)[1] - return libstr.split(':') - return [] + paths = [os.path.realpath(p) for p in libstr.split(':')] + return paths def get_library_dirs(self): key = tuple(self.exelist) @@ -178,6 +180,27 @@ class CCompiler(Compiler): self.library_dirs_cache[key] = self.get_library_dirs_real() return self.library_dirs_cache[key][:] + def get_program_dirs_real(self): + env = os.environ.copy() + env['LC_ALL'] = 'C' + stdo = Popen_safe(self.exelist + ['--print-search-dirs'], env=env)[1] + paths = [] + for line in stdo.split('\n'): + if line.startswith('programs:'): + libstr = line.split('=', 1)[1] + paths = [os.path.realpath(p) for p in libstr.split(':')] + return paths + + def get_program_dirs(self): + ''' + Programs used by the compiler. Also where toolchain DLLs such as + libstdc++-6.dll are found with MinGW. + ''' + key = tuple(self.exelist) + if key not in self.program_dirs_cache: + self.program_dirs_cache[key] = self.get_program_dirs_real() + return self.program_dirs_cache[key][:] + def get_pic_args(self): return ['-fPIC'] diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index c5f7df3..9bd9bb2 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1172,13 +1172,27 @@ class ElbrusCompiler(GnuCompiler): env = os.environ.copy() env['LC_ALL'] = 'C' stdo = Popen_safe(self.exelist + ['--print-search-dirs'], env=env)[1] + paths = [] for line in stdo.split('\n'): if line.startswith('libraries:'): # lcc does not include '=' in --print-search-dirs output. libstr = line.split(' ', 1)[1] - return libstr.split(':') - return [] + paths = [os.path.realpath(p) for p in libstr.split(':')] + break + return paths + def get_program_dirs(self): + env = os.environ.copy() + env['LC_ALL'] = 'C' + stdo = Popen_safe(self.exelist + ['--print-search-dirs'], env=env)[1] + paths = [] + for line in stdo.split('\n'): + if line.startswith('programs:'): + # lcc does not include '=' in --print-search-dirs output. + libstr = line.split(' ', 1)[1] + paths = [os.path.realpath(p) for p in libstr.split(':')] + break + return paths class ClangCompiler: |