From b40c1af900df5e199fab63c1486f7d17b46386b4 Mon Sep 17 00:00:00 2001 From: "Michael Hirsch, Ph.D" Date: Wed, 16 Jan 2019 12:26:47 -0500 Subject: Flang Fortran compiler added. --- mesonbuild/compilers/compilers.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'mesonbuild/compilers/compilers.py') diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 34c0e3b..1e86978 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1311,6 +1311,8 @@ class CompilerType(enum.Enum): PGI_STANDARD = 50 + FLANG_STANDARD = 60 + @property def is_standard_compiler(self): return self.name in ('GCC_STANDARD', 'CLANG_STANDARD', 'ICC_STANDARD') @@ -1619,6 +1621,27 @@ class PGICompiler: def openmp_flags(self): return ['-fopenmp'] + +class FlangCompiler: + def __init__(self, compiler_type): + self.id = 'flang' + self.compiler_type = compiler_type + + default_warn_args = ['-Minform=inform'] + self.warn_args = {'1': default_warn_args, + '2': default_warn_args, + '3': default_warn_args} + + def get_module_incdir_args(self): + return ('-module', ) + + def get_no_warn_args(self): + return ['-silent'] + + def openmp_flags(self): + return ['-fopenmp'] + + class ElbrusCompiler(GnuCompiler): # Elbrus compiler is nearly like GCC, but does not support # PCH, LTO, sanitizers and color output as of version 1.21.x. -- cgit v1.1 From 9a318d3d5a99f6b4d507ff1062f4085f6af86ab8 Mon Sep 17 00:00:00 2001 From: "Michael Hirsch, Ph.D" Date: Wed, 16 Jan 2019 13:56:43 -0500 Subject: better handle link args: PGI and Flang correct flang, pgi options --- mesonbuild/compilers/compilers.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'mesonbuild/compilers/compilers.py') diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 1e86978..a658554 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1619,7 +1619,10 @@ class PGICompiler: return ['-silent'] def openmp_flags(self): - return ['-fopenmp'] + return ['-mp'] + + def get_allow_undefined_link_args(self): + return [] class FlangCompiler: @@ -1639,7 +1642,10 @@ class FlangCompiler: return ['-silent'] def openmp_flags(self): - return ['-fopenmp'] + return ['-mp'] + + def get_allow_undefined_link_args(self): + return [] class ElbrusCompiler(GnuCompiler): -- cgit v1.1 From 9bb21be59bd66ef907cfed5a31269de6f2448a2a Mon Sep 17 00:00:00 2001 From: "Michael Hirsch, Ph.D" Date: Wed, 16 Jan 2019 14:15:36 -0500 Subject: FlangFortranCompiler inherit ClangCompiler --- mesonbuild/compilers/compilers.py | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'mesonbuild/compilers/compilers.py') diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index a658554..758b1c3 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1311,8 +1311,6 @@ class CompilerType(enum.Enum): PGI_STANDARD = 50 - FLANG_STANDARD = 60 - @property def is_standard_compiler(self): return self.name in ('GCC_STANDARD', 'CLANG_STANDARD', 'ICC_STANDARD') @@ -1625,29 +1623,6 @@ class PGICompiler: return [] -class FlangCompiler: - def __init__(self, compiler_type): - self.id = 'flang' - self.compiler_type = compiler_type - - default_warn_args = ['-Minform=inform'] - self.warn_args = {'1': default_warn_args, - '2': default_warn_args, - '3': default_warn_args} - - def get_module_incdir_args(self): - return ('-module', ) - - def get_no_warn_args(self): - return ['-silent'] - - def openmp_flags(self): - return ['-mp'] - - def get_allow_undefined_link_args(self): - return [] - - class ElbrusCompiler(GnuCompiler): # Elbrus compiler is nearly like GCC, but does not support # PCH, LTO, sanitizers and color output as of version 1.21.x. -- cgit v1.1