diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-03 15:55:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 15:55:51 -0500 |
| commit | 35633c68656ef2d4856e816f9701458d1a6a9e8a (patch) | |
| tree | a8f9a6319fc8f363ce41001e551604801447609c /mesonbuild/backend/ninjabackend.py | |
| parent | 027af6b064381a1a48f7fe76d3b54162e5d095e7 (diff) | |
| parent | a99732aaf2e84e2c08e976f05e98e2d7aa96c7d5 (diff) | |
| download | meson-35633c68656ef2d4856e816f9701458d1a6a9e8a.zip meson-35633c68656ef2d4856e816f9701458d1a6a9e8a.tar.gz meson-35633c68656ef2d4856e816f9701458d1a6a9e8a.tar.bz2 | |
Merge pull request #1253 from geier1993/intel
Intel C/C++ Compiler support
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
1 files changed, 5 insertions, 0 deletions
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]) |