Skip to content

Commit 14785de

Browse files
committed
Fix pgcc18 support.
- pgcc18 defines __GNUC__ similar to Intel compilers. So we must check for pgi higher up, or else configury will mistake it for gcc. Signed-off-by: Austen Lauria <[email protected]>
1 parent 5025628 commit 14785de

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

config/opal_check_vendor.m4

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,20 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [
102102
opal_check_compiler_vendor_result="unknown"
103103

104104
# GNU is probably the most common, so check that one as soon as
105-
# possible. Intel pretends to be GNU, so need to check Intel
106-
# before checking for GNU.
105+
# possible. Intel and PGI18 pretends to be GNU, so need to check Intel
106+
# and PGI before checking for GNU.
107107

108108
# Intel
109109
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
110110
[OPAL_IF_IFELSE([defined(__INTEL_COMPILER) || defined(__ICC)],
111111
[opal_check_compiler_vendor_result="intel"])])
112112

113+
# Portland Group
114+
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
115+
[OPAL_IFDEF_IFELSE([__PGI],
116+
[opal_check_compiler_vendor_result="portland group"])])
117+
118+
113119
# Fujitsu
114120
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
115121
[OPAL_IF_IFELSE([defined(__FUJITSU)],
@@ -243,11 +249,6 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [
243249
[OPAL_IFDEF_IFELSE([__POCC__],
244250
[opal_check_compiler_vendor_result="pelles"])])
245251

246-
# Portland Group
247-
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
248-
[OPAL_IFDEF_IFELSE([__PGI],
249-
[opal_check_compiler_vendor_result="portland group"])])
250-
251252
# SAS/C
252253
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
253254
[OPAL_IF_IFELSE([defined(SASC) || defined(__SASC) || defined(__SASC__)],

0 commit comments

Comments
 (0)