From cccffaa29d63503128803b848bd4843cc942538d Mon Sep 17 00:00:00 2001 From: "Michael Hirsch, Ph.D" Date: Tue, 29 Jan 2019 16:25:23 -0500 Subject: BUGFIX: allow fc.run(code) to work, pick only Fortran module --- mesonbuild/backend/ninjabackend.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'mesonbuild/backend/ninjabackend.py') 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 ' -- cgit v1.1