Gcc versions older than 4.9 do not support color output.

pull/623/head
Jussi Pakkanen 9 years ago
parent 4f63fe4983
commit a0666ebf9c
  1. 7
      mesonbuild/backend/backends.py
  2. 6
      mesonbuild/backend/ninjabackend.py
  3. 8
      mesonbuild/compilers.py

@ -83,8 +83,9 @@ class Backend():
return i
raise RuntimeError('No compiler for language ' + lang)
def get_compiler_for_source(self, src):
for i in self.build.compilers:
def get_compiler_for_source(self, src, is_cross):
comp = self.build.cross_compilers if is_cross else self.build.compilers
for i in comp:
if i.can_compile(src):
return i
if isinstance(src, mesonlib.File):
@ -133,7 +134,7 @@ class Backend():
abs_files = []
result = []
for src in unity_src:
comp = self.get_compiler_for_source(src)
comp = self.get_compiler_for_source(src, target.is_cross)
language = comp.get_language()
suffix = '.' + comp.get_default_suffix()
if language not in langlist:

@ -665,7 +665,7 @@ int dummy;
outname_rel = os.path.join(self.get_target_dir(target), fname)
src_list = target.get_sources()
class_list = []
compiler = self.get_compiler_for_source(src_list[0])
compiler = self.get_compiler_for_source(src_list[0], False)
assert(compiler.get_language() == 'java')
c = 'c'
m = ''
@ -716,7 +716,7 @@ int dummy;
fname = target.get_filename()
outname_rel = os.path.join(self.get_target_dir(target), fname)
src_list = target.get_sources()
compiler = self.get_compiler_for_source(src_list[0])
compiler = self.get_compiler_for_source(src_list[0], False)
assert(compiler.get_language() == 'cs')
rel_srcs = [s.rel_to_builddir(self.build_to_src) for s in src_list]
deps = []
@ -1424,7 +1424,7 @@ rule FORTRAN_DEP_HACK
if isinstance(src, RawFilename) and src.fname.endswith('.h'):
raise RuntimeError('Fug')
extra_orderdeps = []
compiler = self.get_compiler_for_source(src)
compiler = self.get_compiler_for_source(src, target.is_cross)
commands = []
# The first thing is implicit include directories: source, build and private.
commands += compiler.get_include_args(self.get_target_private_dir(target), False)

@ -1644,7 +1644,9 @@ class GnuCCompiler(CCompiler):
self.base_options.append('b_lundef')
def get_colorout_args(self, colortype):
return gnu_color_args[colortype][:]
if mesonlib.version_compare(self.version, '>=4.9.0'):
return gnu_color_args[colortype][:]
return []
def get_pic_args(self):
if self.gcc_type == GCC_MINGW:
@ -1831,7 +1833,9 @@ class GnuCPPCompiler(CPPCompiler):
self.base_options.append('b_lundef')
def get_colorout_args(self, colortype):
return gnu_color_args[colortype][:]
if mesonlib.version_compare(self.version, '>=4.9.0'):
return gnu_color_args[colortype][:]
return []
def get_always_args(self):
return ['-pipe']

Loading…
Cancel
Save