summaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/compilers.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-04-29 21:00:40 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2019-05-05 21:58:08 +0300
commit541f2ce535b88ee5c658aa4054aa3eb3fcf42342 (patch)
tree2b5d2208561b3d1b60725ddd9fea937135e6e2f6 /mesonbuild/compilers/compilers.py
parenta0cf7ad3d8fbafacb7146488d8e56c301646aa92 (diff)
downloadmeson-revert5323.tar.gz
Revert "Merge pull request #5323 from scivision/pgiflang"revert5323
This reverts commit 9cd89f55fca0933dd2897ac7470c5827d939e0ac, reversing changes made to 60969d99d33001317c569a9b37d3b9efae08d387.
Diffstat (limited to 'mesonbuild/compilers/compilers.py')
-rw-r--r--mesonbuild/compilers/compilers.py15
1 files changed, 4 insertions, 11 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 2f3c7b7a5..b03458aee 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1413,20 +1413,18 @@ class CompilerType(enum.Enum):
CCRX_WIN = 40
PGI_STANDARD = 50
- PGI_OSX = 51
- PGI_WIN = 52
@property
def is_standard_compiler(self):
- return self.name in ('GCC_STANDARD', 'CLANG_STANDARD', 'ICC_STANDARD', 'PGI_STANDARD')
+ return self.name in ('GCC_STANDARD', 'CLANG_STANDARD', 'ICC_STANDARD')
@property
def is_osx_compiler(self):
- return self.name in ('GCC_OSX', 'CLANG_OSX', 'ICC_OSX', 'PGI_OSX')
+ return self.name in ('GCC_OSX', 'CLANG_OSX', 'ICC_OSX')
@property
def is_windows_compiler(self):
- return self.name in ('GCC_MINGW', 'GCC_CYGWIN', 'CLANG_MINGW', 'ICC_WIN', 'ARM_WIN', 'CCRX_WIN', 'PGI_WIN')
+ return self.name in ('GCC_MINGW', 'GCC_CYGWIN', 'CLANG_MINGW', 'ICC_WIN', 'ARM_WIN', 'CCRX_WIN')
def get_macos_dylib_install_name(prefix, shlib_name, suffix, soversion):
@@ -1708,7 +1706,7 @@ class GnuCompiler(GnuLikeCompiler):
class PGICompiler:
- def __init__(self, compiler_type):
+ def __init__(self, compiler_type=None):
self.id = 'pgi'
self.compiler_type = compiler_type
@@ -1724,11 +1722,6 @@ class PGICompiler:
def get_no_warn_args(self) -> List[str]:
return ['-silent']
- def get_pic_args(self) -> List[str]:
- if self.compiler_type.is_osx_compiler or self.compiler_type.is_windows_compiler:
- return [] # PGI -fPIC is Linux only.
- return ['-fPIC']
-
def openmp_flags(self) -> List[str]:
return ['-mp']