From a9da6c513281bd7c213d8d3d33c78c7ceed9dfd4 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Fri, 2 Sep 2016 22:52:37 +0300 Subject: Moved targets with same name into subdirs to make all tests pass. --- mesonbuild/compilers.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'mesonbuild/compilers.py') diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 4738abd..8394aca 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -354,10 +354,10 @@ class Compiler(): # Some compilers (msvc) write debug info to a separate file. # These args specify where it should be written. - def get_compile_debugfile_args(self, rel_obj, fname_suffix): + def get_compile_debugfile_args(self, rel_obj): return [] - def get_link_debugfile_args(self, rel_obj, fname_suffix): + def get_link_debugfile_args(self, rel_obj): return [] class CCompiler(Compiler): @@ -1607,15 +1607,13 @@ class VisualStudioCCompiler(CCompiler): raise MesonException('Compiling test app failed.') return not(warning_text in stde or warning_text in stdo) - def get_compile_debugfile_args(self, rel_obj, name_suffix): + def get_compile_debugfile_args(self, rel_obj): pdbarr = rel_obj.split('.')[:-1] - pdbarr[-1] += name_suffix pdbarr += ['pdb'] return ['/Fd' + '.'.join(pdbarr)] - def get_link_debugfile_args(self, targetfile, name_suffix): + def get_link_debugfile_args(self, targetfile): pdbarr = targetfile.split('.')[:-1] - pdbarr[-1] += name_suffix pdbarr += ['pdb'] return ['/DEBUG', '/PDB:' + '.'.join(pdbarr)] @@ -2295,9 +2293,8 @@ class VisualStudioLinker(): def unix_compile_flags_to_native(self, args): return args[:] - def get_link_debugfile_args(self, targetfile, name_suffix): + def get_link_debugfile_args(self, targetfile): pdbarr = targetfile.split('.')[:-1] - pdbarr[-1] += name_suffix pdbarr += ['pdb'] return ['/DEBUG', '/PDB:' + '.'.join(pdbarr)] @@ -2350,5 +2347,5 @@ class ArLinker(): def unix_compile_flags_to_native(self, args): return args[:] - def get_link_debugfile_args(self, targetfile, suffix): + def get_link_debugfile_args(self, targetfile): return [] -- cgit v1.1