commit: 4e2041dc53c8f672761fc8b2f97c3b2be16224bf
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 14:55:00 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 14:55:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4e2041dc
scripts/bootstrap-prefix: make sure we pull in matching libcxx
bug #574656 revealed in stage2 we use --nodeps for many reasons, so we
need to pin down the libcxx versions there too, for portage will not
satisfy dependencies there
scripts/bootstrap-prefix.sh | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e1e75fb..a62f9f8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -179,11 +179,23 @@ configure_toolchain() {
esac
# we always have to bootstrap with 3.4 for else we'd
need
# libcxx, which only compiles with clang
- local libcxx="sys-libs/libcxx-headers
sys-libs/libcxxabi sys-libs/libcxx"
- compiler_stage1+=" dev-libs/libffi <sys-devel/llvm-3.5
${libcxx}"
+ compiler_stage1+=" dev-libs/libffi <sys-devel/llvm-3.5"
# similar, the deps for 3.6+ are too high (cmake, ninja,
# python) so we have to do this with an intermediate
- compiler="${libcxx} sys-libs/csu dev-libs/libffi
<sys-devel/llvm-3.6 <sys-devel/clang-3.6"
+ local cdep="3.5.9999"
+ # unfortunately, gmp needs c++, thus libcxx, so have to
drag
+ # it in early (gmp is necessary for 3.5+)
+ local libcxx="
+ <sys-libs/libcxx-headers-${cdep}
+ <sys-libs/libcxxabi-${cdep}
+ <sys-libs/libcxx-${cdep}"
+ compiler_stage1+=" ${libcxx}"
+ compiler="
+ ${libcxx}
+ sys-libs/csu
+ dev-libs/libffi
+ <sys-devel/llvm-${cdep}
+ <sys-devel/clang-${cdep}"
;;
*-*-aix*)
linker=sys-devel/native-cctools
