diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-06-24 16:41:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 16:41:10 -0700 |
| commit | ec97bedd8afbf3bcb53b03365fb06fcf8c51b516 (patch) | |
| tree | e468478fa96d3dd7bd96735008e82c756d884e5e /mesonbuild/backend | |
| parent | e2039da5d99dc8fe4255069ef8ab14459766bf2d (diff) | |
| parent | f990c3eee456a186548dcc48f1d2dca5d8172fe4 (diff) | |
| download | meson-ec97bedd8afbf3bcb53b03365fb06fcf8c51b516.zip meson-ec97bedd8afbf3bcb53b03365fb06fcf8c51b516.tar.gz meson-ec97bedd8afbf3bcb53b03365fb06fcf8c51b516.tar.bz2 | |
Merge pull request #5524 from scivision/icl_ifort
Add ifort on Windows
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 54535ff..a454e6a 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2164,7 +2164,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) # outdir argument instead. # https://github.com/mesonbuild/meson/issues/1348 if not is_generated: - abs_src = os.path.join(build_dir, rel_src) + abs_src = Path(build_dir) / rel_src extra_deps += self.get_fortran_deps(compiler, abs_src, target) # Dependency hack. Remove once multiple outputs in Ninja is fixed: # https://groups.google.com/forum/#!topic/ninja-build/j-2RfBIOd_8 @@ -2802,7 +2802,7 @@ def _scan_fortran_file_deps(src: Path, srcdir: Path, dirname: Path, tdeps, compi # a common occurrence, which would lead to lots of # distracting noise. continue - srcfile = srcdir / tdeps[usename].fname + srcfile = srcdir / tdeps[usename].fname # type: Path if not srcfile.is_file(): if srcfile.name != src.name: # generated source file pass @@ -2824,7 +2824,7 @@ def _scan_fortran_file_deps(src: Path, srcdir: Path, dirname: Path, tdeps, compi ancestor_child = '_'.join(parents) if ancestor_child not in tdeps: raise MesonException("submodule {} relies on ancestor module {} that was not found.".format(submodmatch.group(2).lower(), ancestor_child.split('_')[0])) - submodsrcfile = srcdir / tdeps[ancestor_child].fname + submodsrcfile = srcdir / tdeps[ancestor_child].fname # type: Path if not submodsrcfile.is_file(): if submodsrcfile.name != src.name: # generated source file pass |