fix oshmem_CFLAGS to meet OMPI requirements
Refs: 3763 This commit was SVN r29662.
Этот коммит содержится в:
Mike Dubman
родитель
f1e510154c
Коммит
b10bb525f1
@ -117,44 +117,6 @@ AC_DEFUN([OSHMEM_SETUP_CFLAGS],[
|
||||
|
||||
OMPI_C_COMPILER_VENDOR([oshmem_c_vendor])
|
||||
|
||||
#
|
||||
# OSHMEM force warnings as errors
|
||||
#
|
||||
#
|
||||
# Since SHMEM libraries are not fully ISO99 C compliant
|
||||
# -pedantic and -Wundef raise a bunch of warnings, so
|
||||
# we just strip them off for this component
|
||||
AC_MSG_WARN([Removed -pedantic and -Wundef from CFLAGS for OSHMEM])
|
||||
|
||||
oshmem_CFLAGS="$CFLAGS"
|
||||
|
||||
# Strip off problematic arguments
|
||||
oshmem_CFLAGS="`echo $oshmem_CFLAGS | sed 's/-pedantic//g'`"
|
||||
oshmem_CFLAGS="`echo $oshmem_CFLAGS | sed 's/-Wundef//g'`"
|
||||
oshmem_CFLAGS="`echo $oshmem_CFLAGS | sed 's/-Wno-long-double//g'`"
|
||||
CFLAGS="$oshmem_CFLAGS"
|
||||
|
||||
AC_MSG_CHECKING([if treat OpenSHMEM warnings as errors during build])
|
||||
AC_ARG_ENABLE([oshmem-warnings-as-errors],
|
||||
[AC_HELP_STRING([--enable-oshmem-warnings-as-errors],
|
||||
[Treat OpenSHMEM warnings as errors during build (default:disabled)])])
|
||||
if test "$enable_oshmem_warnings_as_errors" = "yes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
case "$oshmem_c_vendor" in
|
||||
gnu)
|
||||
OSHMEM_CFLAGS=" -Werror"
|
||||
;;
|
||||
intel)
|
||||
# we want specifically the warning on format string conversion
|
||||
OSHMEM_CFLAGS=" -Werror "
|
||||
;;
|
||||
esac
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
AC_SUBST([OSHMEM_CFLAGS])
|
||||
|
||||
OMPI_CHECK_OPENFABRICS([oshmem_verbs],
|
||||
[oshmem_verbs_happy="yes"],
|
||||
[oshmem_verbs_happy="no"])
|
||||
|
||||
@ -9,8 +9,6 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
|
||||
# Do we have profiling?
|
||||
if OSHMEM_PROFILING
|
||||
c_pshmem_lib = shmem/c/profile/libshmem_c_pshmem.la
|
||||
|
||||
@ -8,8 +8,6 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
|
||||
headers += \
|
||||
base/base.h
|
||||
|
||||
|
||||
@ -8,8 +8,6 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
|
||||
sources = \
|
||||
atomic_basic.h \
|
||||
atomic_basic_module.c \
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
AM_CPPFLAGS = $(atomic_mxm_CPPFLAGS)
|
||||
|
||||
mxm_sources = \
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
AM_CPPFLAGS = $(oshmem_verbs_CPPFLAGS)
|
||||
|
||||
dist_pkgdata_DATA += base/help-shmem-mca.txt
|
||||
|
||||
@ -10,8 +10,6 @@
|
||||
|
||||
EXTRA_DIST =
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
|
||||
buddy_sources = \
|
||||
memheap_buddy.c \
|
||||
memheap_buddy.h \
|
||||
|
||||
@ -10,8 +10,6 @@
|
||||
|
||||
EXTRA_DIST =
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
|
||||
ptmalloc_sources = \
|
||||
malloc.c \
|
||||
memheap_ptmalloc.c \
|
||||
|
||||
@ -8,8 +8,6 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
|
||||
headers += \
|
||||
base/base.h
|
||||
|
||||
|
||||
@ -8,8 +8,6 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
|
||||
sources = \
|
||||
scoll_basic.h \
|
||||
scoll_basic_module.c \
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
# $HEADER$
|
||||
#
|
||||
#
|
||||
AM_CPPFLAGS = $(OSHMEM_CFLAGS) $(coll_fca_CPPFLAGS) -DCOLL_FCA_HOME=\"$(coll_fca_HOME)\" -I$(coll_fca_HOME)/include/fca -I$(coll_fca_HOME)/include/fca_core
|
||||
AM_CPPFLAGS = $(coll_fca_CPPFLAGS) -DCOLL_FCA_HOME=\"$(coll_fca_HOME)\" -I$(coll_fca_HOME)/include/fca -I$(coll_fca_HOME)/include/fca_core
|
||||
scoll_fca_sources = \
|
||||
scoll_fca.h \
|
||||
scoll_fca_debug.h \
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS) $(btl_sm_CPPFLAGS)
|
||||
AM_CFLAGS = $(btl_sm_CPPFLAGS)
|
||||
|
||||
headers += \
|
||||
base/base.h \
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
dist_pkgdata_DATA = \
|
||||
help-shmem-spml-ikrit.txt
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
AM_CPPFLAGS = $(spml_ikrit_CPPFLAGS)
|
||||
|
||||
ikrit_sources = \
|
||||
|
||||
@ -14,7 +14,7 @@ dist_pkgdata_DATA = \
|
||||
|
||||
EXTRA_DIST = post_configure.sh
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS) $(btl_sm_CPPFLAGS)
|
||||
AM_CFLAGS = $(btl_sm_CPPFLAGS)
|
||||
|
||||
yoda_sources = \
|
||||
spml_yoda.c \
|
||||
|
||||
@ -56,9 +56,6 @@ SHMEM_API_SOURCES = \
|
||||
shmem_lock.c \
|
||||
globalexit.c
|
||||
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
|
||||
AM_CPPFLAGS = -DOSHMEM_PROFILING=0
|
||||
|
||||
noinst_LTLIBRARIES = libshmem_c.la
|
||||
|
||||
@ -9,8 +9,6 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
AM_CFLAGS = $(OSHMEM_CFLAGS)
|
||||
|
||||
AM_CPPFLAGS = -DOSHMEM_PROFILING_DEFINES=0 -DOSHMEM_HAVE_WEAK_SYMBOLS=0
|
||||
|
||||
if OSHMEM_WANT_FORTRAN_BINDINGS
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user