diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-05-13 23:24:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-13 23:24:14 +0300 |
| commit | 08bd92a6aedeb1375fece723cdafe16bd78fbc01 (patch) | |
| tree | e72cae07f45e83851c4ecc61abbc998b5a62d273 /mesonbuild/backend/ninjabackend.py | |
| parent | 97339d3be4b6f4cab28b8dac9cb467d769049a22 (diff) | |
| parent | 3d88ce70f46f4a39557fd58c24d126dc97dddb5e (diff) | |
| download | meson-08bd92a6aedeb1375fece723cdafe16bd78fbc01.zip meson-08bd92a6aedeb1375fece723cdafe16bd78fbc01.tar.gz meson-08bd92a6aedeb1375fece723cdafe16bd78fbc01.tar.bz2 | |
Merge pull request #1788 from aradi/fix-fortran-scan
Fix scanning of Fortran sources created during configuration
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 076940b..f7e84dc 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1698,12 +1698,13 @@ rule FORTRAN_DEP_HACK modre = re.compile(r"\s*module\s+(\w+)", re.IGNORECASE) module_files = {} for s in target.get_sources(): - # FIXME, does not work for generated Fortran sources, - # but those are really rare. I hope. + # FIXME, does not work for Fortran sources generated by + # custom_target() and generator() as those are run after + # the configuration (configure_file() is OK) if not compiler.can_compile(s): continue - filename = os.path.join(self.environment.get_source_dir(), - s.subdir, s.fname) + filename = s.absolute_path(self.environment.get_source_dir(), + self.environment.get_build_dir()) with open(filename) as f: for line in f: modmatch = modre.match(line) |