summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2019-01-10 08:27:41 +0100
committerFabian Groffen <grobian@gentoo.org>2019-01-10 09:19:31 +0100
commitdc976fc5bc8c2d0f65127941c649d679c0063eab (patch)
tree41d0fd73092b3850ebd08d37528ef7d8af879142
parentscripts/bootstrap-prefix: propagate *FLAGS to target too (diff)
downloadprefix-dc976fc5bc8c2d0f65127941c649d679c0063eab.tar.gz
prefix-dc976fc5bc8c2d0f65127941c649d679c0063eab.tar.bz2
prefix-dc976fc5bc8c2d0f65127941c649d679c0063eab.zip
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@gentoo.org>
-rwxr-xr-xscripts/bootstrap-prefix.sh3
1 files changed, 2 insertions, 1 deletions
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.