1
1

Per RFC: OMPI_CFLAGS_BEFORE_PICKY -> OPAL_CFLAGS_BEFORE_PICKY

- This line, and those below, will be ignored--

M    opal/mca/event/libevent2021/configure.m4
M    opal/mca/hwloc/hwloc172/configure.m4
M    configure.ac
M    config/opal_setup_libltdl.m4
M    config/opal_check_visibility.m4
M    config/opal_setup_cc.m4

This commit was SVN r31637.
Этот коммит содержится в:
Ralph Castain 2014-05-05 22:22:33 +00:00
родитель 425d4b9e81
Коммит a1ae20fddb
6 изменённых файлов: 9 добавлений и 9 удалений

Просмотреть файл

@ -44,13 +44,13 @@ AC_DEFUN([OPAL_CHECK_VISIBILITY],[
sun)
# Check using Sun Studio -xldscope=hidden flag
opal_add=-xldscope=hidden
CFLAGS="$OMPI_CFLAGS_BEFORE_PICKY $opal_add -errwarn=%all"
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $opal_add -errwarn=%all"
;;
*)
# Check using -fvisibility=hidden
opal_add=-fvisibility=hidden
CFLAGS="$OMPI_CFLAGS_BEFORE_PICKY $opal_add -Werror"
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $opal_add -Werror"
;;
esac

Просмотреть файл

@ -128,7 +128,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
# These flags are generally gcc-specific; even the
# gcc-impersonating compilers won't accept them.
OMPI_CFLAGS_BEFORE_PICKY="$CFLAGS"
OPAL_CFLAGS_BEFORE_PICKY="$CFLAGS"
if test "$WANT_PICKY_COMPILER" = 1 -a "$ompi_c_vendor" = "gnu" ; then
add="-Wall -Wundef -Wno-long-long -Wsign-compare"
add="$add -Wmissing-prototypes -Wstrict-prototypes"
@ -314,8 +314,8 @@ AC_DEFUN([OPAL_SETUP_CC],[
fi
fi
OPAL_ENSURE_CONTAINS_OPTFLAGS("$OMPI_CFLAGS_BEFORE_PICKY")
OMPI_CFLAGS_BEFORE_PICKY="$co_result"
OPAL_ENSURE_CONTAINS_OPTFLAGS("$OPAL_CFLAGS_BEFORE_PICKY")
OPAL_CFLAGS_BEFORE_PICKY="$co_result"
AC_MSG_CHECKING([for C optimization flags])
OPAL_ENSURE_CONTAINS_OPTFLAGS(["$CFLAGS"])

Просмотреть файл

@ -160,7 +160,7 @@ AC_DEFUN([_OPAL_SETUP_LIBLTDL_INTERNAL],[
fi
CFLAGS_save="$CFLAGS"
CFLAGS="$OMPI_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"
# VPATH support will be included by default in CONFIG_SUBDIR
OMPI_CONFIG_SUBDIR(opal/libltdl, [$ompi_subdir_args],

Просмотреть файл

@ -502,7 +502,7 @@ if test "$GCC" = "yes"; then
# the first check, and all is fine. :-)
CFLAGS_save=$CFLAGS
CFLAGS="$OMPI_CFLAGS_BEFORE_PICKY -Werror -ansi"
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY -Werror -ansi"
fi
AC_C_INLINE
# Microsoft compilers support 2 versions of restrict. One for functions, and

Просмотреть файл

@ -98,7 +98,7 @@ AC_DEFUN([MCA_opal_event_libevent2021_CONFIG],[
AC_DEFUN([MCA_opal_event_libevent2021_DO_THE_CONFIG], [
CFLAGS_save="$CFLAGS"
CFLAGS="$OMPI_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"
CPPFLAGS_save="$CPPFLAGS"
CPPFLAGS="-I$OMPI_TOP_SRCDIR -I$OMPI_TOP_BUILDDIR -I$OMPI_TOP_SRCDIR/opal/include $CPPFLAGS"

Просмотреть файл

@ -97,7 +97,7 @@ AC_DEFUN([MCA_opal_hwloc_hwloc172_CONFIG],[
# hwloc checks for compiler visibility, and its needs to do
# this without "picky" flags.
opal_hwloc_hwloc172_save_cflags=$CFLAGS
CFLAGS=$OMPI_CFLAGS_BEFORE_PICKY
CFLAGS=$OPAL_CFLAGS_BEFORE_PICKY
HWLOC_SETUP_CORE([opal/mca/hwloc/hwloc172/hwloc],
[AC_MSG_CHECKING([whether hwloc configure succeeded])
AC_MSG_RESULT([yes])