mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-02-17 16:10:24 +08:00
[svn-r26382] Merge r26289 from autotools_rework branch to trunk:
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.
This commit is contained in:
parent
ec2e071c00
commit
84f0d4735a
17
configure
vendored
17
configure
vendored
@ -31701,23 +31701,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
|
||||
|
17
configure.ac
17
configure.ac
@ -3797,23 +3797,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
|
||||
|
Loading…
Reference in New Issue
Block a user