diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-01-16 13:56:43 -0500 |
|---|---|---|
| committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-01-16 17:06:44 -0500 |
| commit | 9a318d3d5a99f6b4d507ff1062f4085f6af86ab8 (patch) | |
| tree | 305e820125d5ec91399c1c208cc767994cb0e434 | |
| parent | b40c1af900df5e199fab63c1486f7d17b46386b4 (diff) | |
| download | meson-9a318d3d5a99f6b4d507ff1062f4085f6af86ab8.zip meson-9a318d3d5a99f6b4d507ff1062f4085f6af86ab8.tar.gz meson-9a318d3d5a99f6b4d507ff1062f4085f6af86ab8.tar.bz2 | |
better handle link args: PGI and Flang
correct flang, pgi options
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 10 | ||||
| -rw-r--r-- | mesonbuild/compilers/fortran.py | 4 |
2 files changed, 10 insertions, 4 deletions
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) |