rollup merge of #17544 : eklitzke/master

This commit is contained in:
Alex Crichton 2014-09-29 08:12:32 -07:00
commit 94c1b1f30c

2
configure vendored
View File

@ -458,7 +458,7 @@ valopt release-channel "dev" "the name of the release channel to build"
# On windows we just store the libraries in the bin directory because
# there's no rpath. This is where the build system itself puts libraries;
# --libdir is used to configure the installation directory.
# FIXME: Thise needs to parameterized over target triples. Do it in platform.mk
# FIXME: This needs to parameterized over target triples. Do it in platform.mk
CFG_LIBDIR_RELATIVE=lib
if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
then