From 54697b41303c900bd44f962d174cda799d177a9e Mon Sep 17 00:00:00 2001 From: Philipp Geier Date: Sat, 24 Dec 2016 17:19:58 +0100 Subject: ICC 17.0.0 working for Linux and Ninja Backend. Added IntelCompiler, IntelCCompiler and IntelCCompiler. environments.py has been changed to detect icc and icpc. ninjabackend changed for proper pch generation. ICC 17.0.0 does not support C++13 (that's why default arguments tests fails). Test 25 object extraction fails due to some unescaped whitespaces. Some test with vala fail because of successful build, although they should fail, as warning do not exit with failure. --- mesonbuild/backend/ninjabackend.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 3491681..60383af 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1837,6 +1837,8 @@ rule FORTRAN_DEP_HACK pchlist = [] if len(pchlist) == 0: pch_dep = [] + elif compiler.id == 'intel': + pch_dep = [] else: arr = [] i = os.path.join(self.get_target_private_dir(target), compiler.get_pch_name(pchlist[0])) @@ -1956,6 +1958,9 @@ rule FORTRAN_DEP_HACK src = os.path.join(self.build_to_src, target.get_source_subdir(), pch[-1]) (commands, dep, dst, objs) = self.generate_msvc_pch_command(target, compiler, pch) extradep = os.path.join(self.build_to_src, target.get_source_subdir(), pch[0]) + elif compiler.id == 'intel': + # Intel generates on target generation + continue else: src = os.path.join(self.build_to_src, target.get_source_subdir(), pch[0]) (commands, dep, dst, objs) = self.generate_gcc_pch_command(target, compiler, pch[0]) -- cgit v1.1