diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-01-29 16:25:23 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-01-29 23:25:23 +0200 |
| commit | cccffaa29d63503128803b848bd4843cc942538d (patch) | |
| tree | ee4e792eab40df529d99b7a10e2dc399085405aa /mesonbuild/backend/ninjabackend.py | |
| parent | da34bea893b3b309800e0f03021a99ee58c599d6 (diff) | |
| download | meson-cccffaa29d63503128803b848bd4843cc942538d.zip meson-cccffaa29d63503128803b848bd4843cc942538d.tar.gz meson-cccffaa29d63503128803b848bd4843cc942538d.tar.bz2 | |
BUGFIX: allow fc.run(code) to work, pick only Fortran module
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index debb4fb..493fc0d 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1826,7 +1826,7 @@ rule FORTRAN_DEP_HACK%s if compiler is None: self.fortran_deps[target.get_basename()] = {} return - modre = re.compile(r"\s*module\s+(\w+)", re.IGNORECASE) + modre = re.compile(r"\bmodule\s+(\w+)\s*$", re.IGNORECASE) module_files = {} for s in target.get_sources(): # FIXME, does not work for Fortran sources generated by @@ -1843,9 +1843,6 @@ rule FORTRAN_DEP_HACK%s modmatch = modre.match(line) if modmatch is not None: modname = modmatch.group(1).lower() - if modname == 'procedure': - # MODULE PROCEDURE construct - continue if modname in module_files: raise InvalidArguments( 'Namespace collision: module %s defined in ' |