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 ++++++++-- mesonbuild/compilers/fortran.py | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'mesonbuild/compilers') 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): diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index 911df46..3387dda 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -371,7 +371,7 @@ class PathScaleFortranCompiler(FortranCompiler): return ['-mp'] -class PGIFortranCompiler(FortranCompiler): +class PGIFortranCompiler(PGICompiler, FortranCompiler): def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags): FortranCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwags) PGICompiler.__init__(self, CompilerType.PGI_STANDARD) @@ -383,7 +383,7 @@ class PGIFortranCompiler(FortranCompiler): return val -class FlangFortranCompiler(FortranCompiler): +class FlangFortranCompiler(FlangCompiler, FortranCompiler): def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags): FortranCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwags) FlangCompiler.__init__(self, CompilerType.FLANG_STANDARD) -- cgit v1.1