[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     9747bcfdfc18c635608d848825b75bec7f05db67
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 19:12:11 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:12:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9747bcfd

scripts/bootstrap-prefix: cleanup temp python2.7 symlink to avoid collisions 
with the real python2.7

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index de47ee2..c47dd13 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1214,10 +1214,11 @@ bootstrap_stage3() {
        # Clang unconditionally requires python, the eclasses are really not
        # setup for a scenario where python doesn't live in the target
        # prefix and no helpers are available
-       ( cd "${ROOT}"/usr/bin && test ! -e python2.7 && test ! -e python && ln 
-s "${ROOT}"/tmp/usr/bin/python2.7 )
+       ( cd "${ROOT}"/usr/bin && test ! -e python && ln -s 
"${ROOT}"/tmp/usr/bin/python2.7 )
        # in addition, avoid collisions
        rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang
        emerge_pkgs --nodeps ${compiler} || return 1
+       ( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python2.7 )
 
        # Use $ROOT tools where possible from now on.
        rm -f "${ROOT}"/bin/sh