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

[Fabian Groffen]

commit:     dc976fc5bc8c2d0f65127941c649d679c0063eab
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 07:27:41 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 08:19:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dc976fc5

scripts/bootstrap-prefix: don't remove LDFLAGS too soon in stage3

We need LDFLAGS to ensure we link/rpath against libs in ROOT, iso
ROOT/tmp whilst building.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 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 cced408b42..39e508de56 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1857,7 +1857,7 @@ bootstrap_stage3() {
                rm -f "${ROOT}"/bin/sh
                ln -s bash "${ROOT}"/bin/sh
        fi
-       unset CONFIG_SHELL MAKEINFO CXX CPPFLAGS LDFLAGS
+       # start using apps from new target
        export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
 
        # get a sane bash, overwriting tmp symlinks
@@ -1900,6 +1900,7 @@ bootstrap_stage3() {
        emerge_pkgs "" "${pkgs[@]}" || return 1
 
        # Switch to the proper portage.
+       unset CONFIG_SHELL MAKEINFO CXX CPPFLAGS LDFLAGS
        hash -r
 
        # Update the portage tree.