* add ability to add compiler / linker flags to the MPI wrapper compilers
from configure (in addition to all the ones that the configure script finds) This commit was SVN r7906.
Этот коммит содержится в:
Brian Barrett
родитель
bf67c9387b
Коммит
1c47b56163
@ -76,6 +76,7 @@ m4_include(config/ompi_setup_cxx.m4)
|
||||
m4_include(config/ompi_setup_f77.m4)
|
||||
m4_include(config/ompi_setup_f90.m4)
|
||||
m4_include(config/ompi_setup_libevent.m4)
|
||||
m4_include(config/ompi_setup_wrappers.m4)
|
||||
m4_include(config/ompi_make_stripped_flags.m4)
|
||||
|
||||
m4_include(config/ompi_check_pthread_pids.m4)
|
||||
|
||||
144
config/ompi_setup_wrappers.m4
Обычный файл
144
config/ompi_setup_wrappers.m4
Обычный файл
@ -0,0 +1,144 @@
|
||||
dnl -*- shell-script -*-
|
||||
dnl
|
||||
dnl Copyright (c) 2004-2005 The Trustees of Indiana University.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
dnl University of Stuttgart. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
dnl All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
|
||||
|
||||
AC_DEFUN([OMPI_SETUP_WRAPPER_INIT],[
|
||||
WRAPPER_EXTRA_CFLAGS=
|
||||
WRAPPER_EXTRA_CXXFLAGS=
|
||||
WRAPPER_EXTRA_FFLAGS=
|
||||
WRAPPER_EXTRA_FCFLAGS=
|
||||
WRAPPER_EXTRA_LDFLAGS=
|
||||
WRAPPER_EXTRA_LIBS=
|
||||
|
||||
AC_ARG_WITH([wrapper-cflags],
|
||||
[AC_HELP_STRING([--with-wrapper-cflags],
|
||||
[Extra flags to add to CFLAGS when using mpicc])])
|
||||
if test "$with_wrapper_cflags" = "yes" -o "$with_wrapper_cflags" = "no"; then
|
||||
AC_MSG_ERROR([--with-wrapper-cflags must have an argument. Aborting])
|
||||
elif test ! -z "$with_wrapper_cflags" ; then
|
||||
WRAPPER_EXTRA_CFLAGS="$with_wrapper_cflags"
|
||||
fi
|
||||
|
||||
AC_ARG_WITH([wrapper-cxxflags],
|
||||
[AC_HELP_STRING([--with-wrapper-cxxflags],
|
||||
[Extra flags to add to CXXFLAGS when using mpiCC/mpic++])])
|
||||
if test "$with_wrapper_cxxflags" = "yes" -o "$with_wrapper_cxxflags" = "no"; then
|
||||
AC_MSG_ERROR([--with-wrapper-cxxflags must have an argument. Aborting])
|
||||
elif test ! -z "$with_wrapper_cxxflags" ; then
|
||||
WRAPPER_EXTRA_CXXFLAGS="$with_wrapper_cxxflags"
|
||||
fi
|
||||
|
||||
AC_ARG_WITH([wrapper-fflags],
|
||||
[AC_HELP_STRING([--with-wrapper-fflags],
|
||||
[Extra flags to add to FFLAGS when using mpif77])])
|
||||
if test "$with_wrapper_fflags" = "yes" -o "$with_wrapper_fflags" = "no"; then
|
||||
AC_MSG_ERROR([--with-wrapper-fflags must have an argument. Aborting])
|
||||
elif test ! -z "$with_wrapper_fflags" ; then
|
||||
WRAPPER_EXTRA_FFLAGS="$with_wrapper_fflags"
|
||||
fi
|
||||
|
||||
AC_ARG_WITH([wrapper-fcflags],
|
||||
[AC_HELP_STRING([--with-wrapper-fcflags],
|
||||
[Extra flags to add to FCFLAGS when using mpif90])])
|
||||
if test "$with_wrapper_fcflags" = "yes" -o "$with_wrapper_fcflags" = "no"; then
|
||||
AC_MSG_ERROR([--with-wrapper-fcflags must have an argument. Aborting])
|
||||
elif test ! -z "$with_wrapper_fcflags" ; then
|
||||
WRAPPER_EXTRA_FCFLAGS="$with_wrapper_fcflags"
|
||||
fi
|
||||
|
||||
AC_ARG_WITH([wrapper-ldflags],
|
||||
[AC_HELP_STRING([--with-wrapper-ldflags],
|
||||
[Extra flags to add to LDFLAGS when using wrapper compilers])])
|
||||
if test "$with_wrapper_ldflags" = "yes" -o "$with_wrapper_ldflags" = "no"; then
|
||||
AC_MSG_ERROR([--with-wrapper-ldflags must have an argument. Aborting])
|
||||
elif test ! -z "$with_wrapper_ldflags" ; then
|
||||
WRAPPER_EXTRA_LDFLAGS="$with_wrapper_ldflags"
|
||||
fi
|
||||
|
||||
AC_ARG_WITH([wrapper-libs],
|
||||
[AC_HELP_STRING([--with-wrapper-libs],
|
||||
[Extra flags to add to LIBS when using wrapper compilers])])
|
||||
if test "$with_wrapper_libs" = "yes" -o "$with_wrapper_libs" = "no"; then
|
||||
AC_MSG_ERROR([--with-wrapper-libs must have an argument. Aborting])
|
||||
elif test ! -z "$with_wrapper_libs" ; then
|
||||
WRAPPER_EXTRA_LIBS="$with_wrapper_libs"
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[
|
||||
#
|
||||
# Adding WRAPPER_* flags so that extra flags needed for wrappper compilers
|
||||
#
|
||||
# WRAPPER_EXTRA_CFLAGS
|
||||
#
|
||||
AC_MSG_CHECKING([for mpicc CFLAGS])
|
||||
OMPI_UNIQ(WRAPPER_EXTRA_CFLAGS)
|
||||
AC_SUBST(WRAPPER_EXTRA_CFLAGS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CFLAGS, "$WRAPPER_EXTRA_CFLAGS",
|
||||
[Additional CFLAGS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_CFLAGS])
|
||||
|
||||
#
|
||||
# WRAPPER_EXTRA_CXXFLAGS
|
||||
#
|
||||
AC_MSG_CHECKING([for mpiCC CXXFLAGS])
|
||||
OMPI_UNIQ(WRAPPER_EXTRA_CXXFLAGS)
|
||||
AC_SUBST(WRAPPER_EXTRA_CXXFLAGS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CXXFLAGS, "$WRAPPER_EXTRA_CXXFLAGS",
|
||||
[Additional CXXFLAGS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_CXXFLAGS])
|
||||
|
||||
#
|
||||
# WRAPPER_EXTRA_FFLAGS
|
||||
#
|
||||
AC_MSG_CHECKING([for mpif77/mpif90 FFLAGS])
|
||||
OMPI_UNIQ(WRAPPER_EXTRA_FFLAGS)
|
||||
AC_SUBST(WRAPPER_EXTRA_FFLAGS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_FFLAGS, "$WRAPPER_EXTRA_FFLAGS",
|
||||
[Additional FFLAGS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_FFLAGS])
|
||||
|
||||
#
|
||||
# WRAPPER_EXTRA_FCFLAGS
|
||||
#
|
||||
AC_MSG_CHECKING([for mpif77/mpif90 FCFLAGS])
|
||||
OMPI_UNIQ(WRAPPER_EXTRA_FCFLAGS)
|
||||
AC_SUBST(WRAPPER_EXTRA_FCFLAGS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_FCFLAGS, "$WRAPPER_EXTRA_FCFLAGS",
|
||||
[Additional FCFLAGS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_FCFLAGS])
|
||||
|
||||
#
|
||||
# WRAPPER_EXTRA_LDFLAGS
|
||||
#
|
||||
AC_MSG_CHECKING([for wrapper compiler LDFLAGS])
|
||||
OMPI_UNIQ(WRAPPER_EXTRA_LDFLAGS)
|
||||
AC_SUBST(WRAPPER_EXTRA_LDFLAGS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LDFLAGS, "$WRAPPER_EXTRA_LDFLAGS",
|
||||
[Additional LDFLAGS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_LDFLAGS])
|
||||
|
||||
#
|
||||
# WRAPPER_EXTRA_LIBS
|
||||
#
|
||||
AC_MSG_CHECKING([for wrapper compiler LIBS])
|
||||
AC_SUBST(WRAPPER_EXTRA_LIBS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LIBS, "$WRAPPER_EXTRA_LIBS",
|
||||
[Additional LIBS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_LIBS])
|
||||
])
|
||||
80
configure.ac
80
configure.ac
@ -245,13 +245,7 @@ ompi_enable_static="$enable_static"
|
||||
AM_ENABLE_SHARED
|
||||
AM_DISABLE_STATIC
|
||||
|
||||
WRAPPER_EXTRA_CFLAGS=
|
||||
WRAPPER_EXTRA_CXXFLAGS=
|
||||
WRAPPER_EXTRA_FFLAGS=
|
||||
WRAPPER_EXTRA_FCFLAGS=
|
||||
WRAPPER_EXTRA_LDFLAGS=
|
||||
WRAPPER_EXTRA_LIBS=
|
||||
|
||||
OMPI_SETUP_WRAPPER_INIT
|
||||
|
||||
|
||||
############################################################################
|
||||
@ -1507,12 +1501,11 @@ AC_DEFINE_UNQUOTED(OMPI_WANT_LIBLTDL, $WANT_LIBLTDL,
|
||||
OPAL_LTDL_CPPFLAGS='-I$(top_srcdir)/opal/libltdl'
|
||||
AC_SUBST(OPAL_LTDL_CPPFLAGS)
|
||||
|
||||
|
||||
############################################################################
|
||||
# final wrapper compiler config
|
||||
# final compiler config
|
||||
############################################################################
|
||||
|
||||
ompi_show_subtitle "Wrapper compiler flags"
|
||||
ompi_show_subtitle "Compiler flags"
|
||||
|
||||
#
|
||||
# This is needed for VPATH builds, so that it will -I the appropriate
|
||||
@ -1550,67 +1543,6 @@ AC_MSG_RESULT([$TOTALVIEW_DEBUG_FLAGS])
|
||||
AC_SUBST(CFLAGS_WITHOUT_OPTFLAGS)
|
||||
AC_SUBST(TOTALVIEW_DEBUG_FLAGS)
|
||||
|
||||
#
|
||||
# Adding WRAPPER_* flags so that extra flags needed for wrappper compilers
|
||||
#
|
||||
# WRAPPER_EXTRA_CFLAGS
|
||||
#
|
||||
AC_MSG_CHECKING([for mpicc CFLAGS])
|
||||
OMPI_UNIQ(WRAPPER_EXTRA_CFLAGS)
|
||||
AC_SUBST(WRAPPER_EXTRA_CFLAGS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CFLAGS, "$WRAPPER_EXTRA_CFLAGS",
|
||||
[Additional CFLAGS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_CFLAGS])
|
||||
|
||||
#
|
||||
# WRAPPER_EXTRA_CXXFLAGS
|
||||
#
|
||||
AC_MSG_CHECKING([for mpiCC CXXFLAGS])
|
||||
OMPI_UNIQ(WRAPPER_EXTRA_CXXFLAGS)
|
||||
AC_SUBST(WRAPPER_EXTRA_CXXFLAGS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CXXFLAGS, "$WRAPPER_EXTRA_CXXFLAGS",
|
||||
[Additional CXXFLAGS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_CXXFLAGS])
|
||||
|
||||
#
|
||||
# WRAPPER_EXTRA_FFLAGS
|
||||
#
|
||||
AC_MSG_CHECKING([for mpif77/mpif90 FFLAGS])
|
||||
OMPI_UNIQ(WRAPPER_EXTRA_FFLAGS)
|
||||
AC_SUBST(WRAPPER_EXTRA_FFLAGS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_FFLAGS, "$WRAPPER_EXTRA_FFLAGS",
|
||||
[Additional FFLAGS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_FFLAGS])
|
||||
|
||||
#
|
||||
# WRAPPER_EXTRA_FCFLAGS
|
||||
#
|
||||
AC_MSG_CHECKING([for mpif77/mpif90 FCFLAGS])
|
||||
OMPI_UNIQ(WRAPPER_EXTRA_FCFLAGS)
|
||||
AC_SUBST(WRAPPER_EXTRA_FCFLAGS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_FCFLAGS, "$WRAPPER_EXTRA_FCFLAGS",
|
||||
[Additional FCFLAGS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_FCFLAGS])
|
||||
|
||||
#
|
||||
# WRAPPER_EXTRA_LDFLAGS
|
||||
#
|
||||
AC_MSG_CHECKING([for wrapper compiler LDFLAGS])
|
||||
OMPI_UNIQ(WRAPPER_EXTRA_LDFLAGS)
|
||||
AC_SUBST(WRAPPER_EXTRA_LDFLAGS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LDFLAGS, "$WRAPPER_EXTRA_LDFLAGS",
|
||||
[Additional LDFLAGS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_LDFLAGS])
|
||||
|
||||
#
|
||||
# WRAPPER_EXTRA_LIBS
|
||||
#
|
||||
AC_MSG_CHECKING([for wrapper compiler LIBS])
|
||||
AC_SUBST(WRAPPER_EXTRA_LIBS)
|
||||
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LIBS, "$WRAPPER_EXTRA_LIBS",
|
||||
[Additional LIBS to pass through the wrapper compilers])
|
||||
AC_MSG_RESULT([$WRAPPER_EXTRA_LIBS])
|
||||
|
||||
#
|
||||
# Adding LIBMPI_* flags from the components that are necessary to
|
||||
# compile with libmpi
|
||||
@ -1645,6 +1577,12 @@ AC_SUBST(CXXCPPFLAGS)
|
||||
AC_SUBST(FFLAGS)
|
||||
AC_SUBST(FCFLAGS)
|
||||
|
||||
############################################################################
|
||||
# final wrapper compiler config
|
||||
############################################################################
|
||||
|
||||
ompi_show_subtitle "Wrapper compiler flags"
|
||||
OMPI_SETUP_WRAPPER_FINAL
|
||||
|
||||
############################################################################
|
||||
# Party on
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user