summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2002-04-12 20:04:35 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2002-04-12 20:04:35 (GMT)
commit48f1fde29e21ff5a84808d55ded555e79679af92 (patch)
tree8204c497cd8f9d5e52c403d52091fe83206fd2b3
parent4a77525456695cd707c800920efb358bcdc3f702 (diff)
downloadhdf5-48f1fde29e21ff5a84808d55ded555e79679af92.zip
hdf5-48f1fde29e21ff5a84808d55ded555e79679af92.tar.gz
hdf5-48f1fde29e21ff5a84808d55ded555e79679af92.tar.bz2
[svn-r5179] Purpose:
Bug Fix Description: Ported the hack of hte ltmain.sh script from the v1.4 branch to the 1.5 branch, since it's sure to fail on systems with really long -Wl... flags...
-rw-r--r--bin/ltmain.sh36
1 files changed, 34 insertions, 2 deletions
diff --git a/bin/ltmain.sh b/bin/ltmain.sh
index 7b739c8..05c61ef 100644
--- a/bin/ltmain.sh
+++ b/bin/ltmain.sh
@@ -3211,7 +3211,29 @@ EOF
libdir="$hardcode_libdirs"
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- finalize_rpath="$rpath"
+ ###################################################################
+ # HACK: Fixes the problem with compilers on Irix[56] machines which
+ # can't handle long -Wl flags being sent to the linker during a
+ # "recompile" just before execution. -BW 08. April 2002
+ case "$host" in
+ *irix[56]*)
+ # Add in paths just for the HDF5 library stuff...
+ pwd=`pwd`;
+ rpath="${wl}-rpath ${wl}$pwd/.libs:$pwd/../src/.libs:$pwd/../../src/.libs:$pwd/../test/.libs$rpath";
+
+ # Modify the rpaths so that the compiler can handle the number
+ # of library paths
+ finalize_rpath=`echo $rpath | sed -e "s#:# ${wl}-rpath ${wl}#g"`;
+ compile_rpath=`echo $rpath | sed -e "s#:# ${wl}-rpath ${wl}#g"`;
+ ;;
+ *)
+ finalize_rpath="$rpath";
+ ;;
+ esac
+ #
+ # End HACK
+ #
+ ###################################################################
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
@@ -3680,7 +3702,17 @@ else
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$echo >> $output "\
# Add our own library path to $shlibpath_var
- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+ ###################################################################
+ # HACK: This hack has been in HDF5's ltmain.sh file from since I
+ # started messing with the Makefile/configure system. I'm loathe to
+ # remove it because it seems to work for us.
+ #
+ ##$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+ $shlibpath_var=\"$finalize_shlibpath$temp_rpath\$$shlibpath_var\"
+ #
+ # End HACK
+ #
+ ###################################################################
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed