summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2015-03-13 14:33:31 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2015-03-13 14:33:31 (GMT)
commit25281fc525faf80c9bf96729d3616c2eded6e9fa (patch)
tree9986fd5119a75c773cd4fb4ae24d4d1ce04edf18
parent690b40f17a9b66475ebc46a5df6153f86c524beb (diff)
downloadhdf5-25281fc525faf80c9bf96729d3616c2eded6e9fa.zip
hdf5-25281fc525faf80c9bf96729d3616c2eded6e9fa.tar.gz
hdf5-25281fc525faf80c9bf96729d3616c2eded6e9fa.tar.bz2
[svn-r26444] Merge r26382 from trunk to hdf5_1_8:
Purpose: Fix HDFFV-9124 - Remove old libtool post-processing Description: This revision removes some post-processing of the generated libtool script, which was added back in 2003 (see svn revisions 6285 and 6293) to address a deficiency in which the script failed to set the '$wl' variable for icc and pgcc compilers. Libtool has since fixed the issue, and the post-processing we've been running has essentially been a no-op for years, so it's safe for us to remove the post-processing snippet. Tested: Jam using pgcc and icc compilers.
-rwxr-xr-xconfigure17
-rw-r--r--configure.ac17
2 files changed, 0 insertions, 34 deletions
diff --git a/configure b/configure
index 6a68943..fd23d05 100755
--- a/configure
+++ b/configure
@@ -31697,23 +31697,6 @@ touch ./config/stamp2
## Finally the makefiles
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-## Post processing to patch up some deficiencies in libtool
-case $host_os in
- linux* | freebsd* )
- ## If gcc is not used, need to set $wl to use "-Wl,"
- if $CC -v 2>&1 | grep '^gcc' > /dev/null ; then
- : using gcc
- else
- echo 'fixing $wl in' $ofile
-ed - $ofile <<EOF 2> /dev/null
-g/^wl=""/s//wl="-Wl,"/
-w
-q
-EOF
- fi
- ;;
-esac
-
## Are we compiling static libraries, shared libraries, or both? This
## is only used for the libhdf5.settings file. We can't just look at
## $enable_static and $enable_shared because if they're yes the ltconfig
diff --git a/configure.ac b/configure.ac
index f915a8b..35ad0a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3794,23 +3794,6 @@ touch ./config/stamp2
## Finally the makefiles
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-## Post processing to patch up some deficiencies in libtool
-case $host_os in
- linux* | freebsd* )
- ## If gcc is not used, need to set $wl to use "-Wl,"
- if $CC -v 2>&1 | grep '^gcc' > /dev/null ; then
- : using gcc
- else
- echo 'fixing $wl in' $ofile
-ed - $ofile <<EOF 2> /dev/null
-g/^wl=""/s//wl="-Wl,"/
-w
-q
-EOF
- fi
- ;;
-esac
-
## Are we compiling static libraries, shared libraries, or both? This
## is only used for the libhdf5.settings file. We can't just look at
## $enable_static and $enable_shared because if they're yes the ltconfig