summaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/fortran.py
diff options
context:
space:
mode:
authorMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-01-27 13:57:21 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2019-01-27 20:57:21 +0200
commit8636f31d9c6f44a19cca0622b5478fa6202c1334 (patch)
tree1820a754596d15c59cdd48da16b92a828f358428 /mesonbuild/compilers/fortran.py
parent3fc8a0dc41622850dc6a50debff3f27b7c080a51 (diff)
downloadmeson-8636f31d9c6f44a19cca0622b5478fa6202c1334.tar.gz
BUGFIX: broken/missing Fortran code/unit tests
Diffstat (limited to 'mesonbuild/compilers/fortran.py')
-rw-r--r--mesonbuild/compilers/fortran.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
index e7486db72..c29c4bd00 100644
--- a/mesonbuild/compilers/fortran.py
+++ b/mesonbuild/compilers/fortran.py
@@ -11,6 +11,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+from typing import List
+import subprocess, os
from .c import CCompiler
from .compilers import (
@@ -29,7 +31,7 @@ from .compilers import (
)
from mesonbuild.mesonlib import EnvironmentException, is_osx
-import subprocess, os
+
class FortranCompiler(Compiler):
library_dirs_cache = CCompiler.library_dirs_cache
@@ -228,7 +230,7 @@ end program prog
dependencies=dependencies)
def run(self, code, env, *, extra_args=None, dependencies=None):
- return CCompiler.run(self, code, env, extra_args, dependencies)
+ return CCompiler.run(self, code, env, extra_args=extra_args, dependencies=dependencies)
def _get_patterns(self, *args, **kwargs):
return CCompiler._get_patterns(self, *args, **kwargs)
@@ -263,6 +265,13 @@ end program prog
def has_multi_arguments(self, args, env):
return CCompiler.has_multi_arguments(self, args, env)
+ @classmethod
+ def _get_trials_from_pattern(cls, pattern, directory, libname):
+ return CCompiler._get_trials_from_pattern(pattern, directory, libname)
+
+ @staticmethod
+ def _get_file_from_list(files) -> List[str]:
+ return CCompiler._get_file_from_list(files)
class GnuFortranCompiler(GnuCompiler, FortranCompiler):
def __init__(self, exelist, version, compiler_type, is_cross, exe_wrapper=None, defines=None, **kwargs):