diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-07-03 02:29:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-03 02:29:50 +0300 |
| commit | d6ab5027feac5e3c784e9a6577cbe790c9082643 (patch) | |
| tree | f94b8e1b0f40ac7cd8dcd4596c7811d1428f9d76 /mesonbuild/backend | |
| parent | c0057da133d212dd4e0efeab84e2a34f814c5c83 (diff) | |
| parent | a0666ebf9c4e193f176fa1aeafbcbf13445b51f4 (diff) | |
| download | meson-d6ab5027feac5e3c784e9a6577cbe790c9082643.zip meson-d6ab5027feac5e3c784e9a6577cbe790c9082643.tar.gz meson-d6ab5027feac5e3c784e9a6577cbe790c9082643.tar.bz2 | |
Merge pull request #623 from mesonbuild/colorout
Enable colored output with GCC.
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/backends.py | 7 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 05a3565..fcc3d3b 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.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: diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 9bc4842..a1bccc2 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -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) |