1
1

Also strip out -g[0-9] (in addition to -g) from CCASFLAGS on Leopard. Fixes trac:1701. Thanks to Barry Smith for reporting the problem.

This commit was SVN r20096.

The following Trac tickets were found above:
  Ticket 1701 --> https://svn.open-mpi.org/trac/ompi/ticket/1701
Этот коммит содержится в:
Jeff Squyres 2008-12-09 23:42:16 +00:00
родитель 3950796fa8
Коммит cad0f41391
2 изменённых файлов: 12 добавлений и 4 удалений

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

@ -230,7 +230,7 @@ Trunk (not on release branches yet)
- Added support for parallel debuggers even when we have an optimized build.
See ticket #1178.
- Worked around a bus error in the Mac OS X 10.5.X (Leopard) linker when
compiling Open MPI with -g. See ticket #1179.
compiling Open MPI with -g|-g[0-9]. See ticket #1179.
- Removed some warnings about 'rm' from Mac OS X 10.5 (Leopard) builds.
- Fix the handling of mx_finalize(). See ticket #1177.
Thanks to Ake Sandgren for bringing this issue to our attention.

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

@ -9,6 +9,7 @@ dnl Copyright (c) 2004-2006 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 (c) 2008 Cisco Systems, Inc. All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
@ -803,7 +804,7 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
AC_REQUIRE([OMPI_SETUP_CXX])
AC_REQUIRE([AM_PROG_AS])
# OS X Leopard ld bus errors if you have "-g" in the link line
# OS X Leopard ld bus errors if you have "-g" or "-gX" in the link line
# with our assembly (!). So remove it from CCASFLAGS if it's
# there (and we're on Leopard).
OMPI_VAR_SCOPE_PUSH([ompi_config_asm_flags_new ompi_config_asm_flag])
@ -811,9 +812,16 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
case "$host" in
*-apple-darwin9.*)
for ompi_config_asm_flag in $CCASFLAGS; do
if test "$ompi_config_asm_flag" != "-g"; then
# See http://www.gnu.org/software/autoconf/manual/html_node/Quadrigraphs.html#Quadrigraphs
# for an explanation of @<:@ and @:>@ -- they m4 expand
# to [ and ]
case $ompi_config_asm_flag in
-g) ;;
-g@<:@0-9@:>@) ;;
*)
ompi_config_asm_flags_new="$ompi_config_asm_flags_new $ompi_config_asm_flag"
fi
;;
esac
done
CCASFLAGS="$ompi_config_asm_flags_new"
AC_MSG_RESULT([OS X Leopard - yes ($CCASFLAGS)])