Skip to content

Commit 062a72b

Browse files
committed
Fix configury where most compilers will get mislabeled as 'gnu'.
Most compilers define the __GNU__ macro, so put it at the bottom as a catch-all. Tested with gcc, xlc, pgi and clang. Signed-off-by: Austen Lauria <[email protected]>
1 parent 6d7a4d3 commit 062a72b

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

config/opal_check_vendor.m4

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -132,30 +132,6 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [
132132
],
133133
[OPAL_IF_IFELSE([defined(_AIX) && !defined(__GNUC__)],
134134
[opal_check_compiler_vendor_result="ibm"])])])
135-
136-
# GNU
137-
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
138-
[OPAL_IFDEF_IFELSE([__GNUC__],
139-
[opal_check_compiler_vendor_result="gnu"
140-
141-
# We do not support gccfss as a compiler so die if
142-
# someone tries to use said compiler. gccfss (gcc
143-
# for SPARC Systems) is a compiler that is no longer
144-
# supported by Oracle and it has some major flaws
145-
# that prevents it from actually compiling OMPI code.
146-
# So if we detect it we automatically bail.
147-
148-
if ($CC --version | grep gccfss) >/dev/null 2>&1; then
149-
AC_MSG_RESULT([gccfss])
150-
AC_MSG_WARN([Detected gccfss being used to compile Open MPI.])
151-
AC_MSG_WARN([Because of several issues Open MPI does not support])
152-
AC_MSG_WARN([the gccfss compiler. Please use a different compiler.])
153-
AC_MSG_WARN([If you did not think you used gccfss you may want to])
154-
AC_MSG_WARN([check to see if the compiler you think you used is])
155-
AC_MSG_WARN([actually a link to gccfss.])
156-
AC_MSG_ERROR([Cannot continue])
157-
fi])])
158-
159135
# Borland Turbo C
160136
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
161137
[OPAL_IFDEF_IFELSE([__TURBOC__],
@@ -279,6 +255,29 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [
279255
[OPAL_IFDEF_IFELSE([__WATCOMC__],
280256
[opal_check_compiler_vendor_result="watcom"])])
281257

258+
# GNU
259+
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
260+
[OPAL_IFDEF_IFELSE([__GNUC__],
261+
[opal_check_compiler_vendor_result="gnu"
262+
263+
# We do not support gccfss as a compiler so die if
264+
# someone tries to use said compiler. gccfss (gcc
265+
# for SPARC Systems) is a compiler that is no longer
266+
# supported by Oracle and it has some major flaws
267+
# that prevents it from actually compiling OMPI code.
268+
# So if we detect it we automatically bail.
269+
270+
if ($CC --version | grep gccfss) >/dev/null 2>&1; then
271+
AC_MSG_RESULT([gccfss])
272+
AC_MSG_WARN([Detected gccfss being used to compile Open MPI.])
273+
AC_MSG_WARN([Because of several issues Open MPI does not support])
274+
AC_MSG_WARN([the gccfss compiler. Please use a different compiler.])
275+
AC_MSG_WARN([If you did not think you used gccfss you may want to])
276+
AC_MSG_WARN([check to see if the compiler you think you used is])
277+
AC_MSG_WARN([actually a link to gccfss.])
278+
AC_MSG_ERROR([Cannot continue])
279+
fi])])
280+
282281
$1="$opal_check_compiler_vendor_result"
283282
unset opal_check_compiler_vendor_result
284283
])

0 commit comments

Comments
 (0)