Skip to content

Commit ee7e1f0

Browse files
authored
Merge pull request #11089 from ggouaillardet/topic/romio341_gcc48
io/romio341: fix support for GCC 4.8 compilers
2 parents 806b4f7 + c2ac975 commit ee7e1f0

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

ompi/mca/io/romio341/configure.m4

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
1313
# Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
14-
# Copyright (c) 2015-2021 Research Organization for Information Science
14+
# Copyright (c) 2015-2022 Research Organization for Information Science
1515
# and Technology (RIST). All rights reserved.
1616
# $COPYRIGHT$
1717
#
@@ -99,14 +99,21 @@ AC_DEFUN([MCA_ompi_io_romio341_CONFIG],[
9999
. 3rd-party/romio341/localdefs
100100
io_romio341_LIBS="$LIBS"
101101
LIBS="$io_romio341_save_LIBS"
102-
OPAL_3RDPARTY_SUBDIRS="$OPAL_3RDPARTY_SUBDIRS romio341"
103102
OPAL_3RDPARTY_DIST_SUBDIRS="$OPAL_3RDPARTY_DIST_SUBDIRS romio341"
104103

105-
echo "ROMIO distribution configured successfully"
106-
$1],
104+
AC_MSG_NOTICE([ROMIO distribution configured successfully])],
107105
[AS_IF([test "$enable_io_romio" = "yes"],
108106
[AC_MSG_ERROR([ROMIO distribution did not configure successfully])],
109-
[AC_MSG_WARN([ROMIO distribution did not configure successfully])])
110-
$2])])])
107+
[AC_MSG_WARN([ROMIO distribution did not configure successfully])])])
108+
109+
AS_IF([test "$io_romio341_happy" = "1"],
110+
[AC_CHECK_HEADERS([stdatomic.h],
111+
[OPAL_3RDPARTY_SUBDIRS="$OPAL_3RDPARTY_SUBDIRS romio341"],
112+
[AC_MSG_WARN([3rd party ROMIO cannot be built, disqualifying the io/romio341 component])
113+
io_romio341_happy=0])])
114+
115+
AS_IF([test "$io_romio341_happy" = "1"],
116+
[$1],
117+
[$2])])])
111118
OPAL_VAR_SCOPE_POP
112119
])

0 commit comments

Comments
 (0)