Multiarch fixes for devel/libtool-*
Backport fixes from trunk.