From ff6b068b9333a51b6e4da7e603adc6ed51007912 Mon Sep 17 00:00:00 2001 From: Austen Lauria Date: Tue, 11 Feb 2020 15:55:42 -0500 Subject: [PATCH] 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 (cherry picked from commit 14785deb3c6609cb3f6763d0e07a49e86588c4da) --- config/opal_check_vendor.m4 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/config/opal_check_vendor.m4 b/config/opal_check_vendor.m4 index 056d939759..ed789287e6 100644 --- a/config/opal_check_vendor.m4 +++ b/config/opal_check_vendor.m4 @@ -102,14 +102,20 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [ opal_check_compiler_vendor_result="unknown" # GNU is probably the most common, so check that one as soon as - # possible. Intel pretends to be GNU, so need to check Intel - # before checking for GNU. + # possible. Intel and PGI18 pretends to be GNU, so need to check Intel + # and PGI before checking for GNU. # Intel AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"], [OPAL_IF_IFELSE([defined(__INTEL_COMPILER) || defined(__ICC)], [opal_check_compiler_vendor_result="intel"])]) + # Portland Group + AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"], + [OPAL_IFDEF_IFELSE([__PGI], + [opal_check_compiler_vendor_result="portland group"])]) + + # Fujitsu AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"], [OPAL_IF_IFELSE([defined(__FUJITSU)], @@ -243,11 +249,6 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [ [OPAL_IFDEF_IFELSE([__POCC__], [opal_check_compiler_vendor_result="pelles"])]) - # Portland Group - AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"], - [OPAL_IFDEF_IFELSE([__PGI], - [opal_check_compiler_vendor_result="portland group"])]) - # SAS/C AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"], [OPAL_IF_IFELSE([defined(SASC) || defined(__SASC) || defined(__SASC__)],