1
1

Refs trac:3046: feedback from Brian -- don't set DYLD_LIBRARY_PATH.

This commit was SVN r26108.

The following Trac tickets were found above:
  Ticket 3046 --> https://svn.open-mpi.org/trac/ompi/ticket/3046
Этот коммит содержится в:
Jeff Squyres 2012-03-07 13:12:22 +00:00
родитель e71e871bae
Коммит aeca190744

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

@ -1,6 +1,6 @@
dnl -*- shell-script -*- dnl -*- shell-script -*-
dnl dnl
dnl Copyright (c) 2010-2011 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl
dnl Additional copyrights may follow dnl Additional copyrights may follow
@ -127,10 +127,10 @@ AC_DEFUN([MCA_opal_hwloc_CONFIG_REQUIRE],[
_MCA_opal_hwloc_base_flags([wrapper LIBS], [WRAPPER_EXTRA_LIBS]) _MCA_opal_hwloc_base_flags([wrapper LIBS], [WRAPPER_EXTRA_LIBS])
# If we added any -L flags to ADD_LDFLAGS, then we (might) # If we added any -L flags to ADD_LDFLAGS, then we (might)
# need to add those directories to LD_LIBRARY_PATH and # need to add those directories to LD_LIBRARY_PATH.
# DYLD_LIBRARY_PATH. Otherwise, if we try to AC RUN_IFELSE # Otherwise, if we try to AC RUN_IFELSE anything here in
# anything here in configure, it might die because it can't # configure, it might die because it can't find the libraries
# find the libraries we just linked against. # we just linked against.
found_l=0 found_l=0
eval "tmp=\$opal_hwloc_${opal_hwloc_winner}_ADD_LIBS" eval "tmp=\$opal_hwloc_${opal_hwloc_winner}_ADD_LIBS"
for token in $tmp; do for token in $tmp; do
@ -145,7 +145,6 @@ AC_DEFUN([MCA_opal_hwloc_CONFIG_REQUIRE],[
-L*) -L*)
dir=`echo $token | cut -c3-` dir=`echo $token | cut -c3-`
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dir export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dir
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$dir
AC_MSG_WARN([Adding to (DY)LD_LIBRARY_PATH: $dir]) AC_MSG_WARN([Adding to (DY)LD_LIBRARY_PATH: $dir])
;; ;;
esac esac