summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2024-03-29 12:51:23 +0100
committerFabian Groffen <grobian@gentoo.org>2024-03-29 12:51:23 +0100
commitfc8ff18f3a1a54c592dcfdb3a5c0a514de6f0ad7 (patch)
treea847c7b5a6fa8ce43f8e72c0534d496928879681
parentscripts/bootstrap-prefix: shellcheck (diff)
downloadprefix-fc8ff18f3a1a54c592dcfdb3a5c0a514de6f0ad7.tar.gz
prefix-fc8ff18f3a1a54c592dcfdb3a5c0a514de6f0ad7.tar.bz2
prefix-fc8ff18f3a1a54c592dcfdb3a5c0a514de6f0ad7.zip
scripts/bootstrap-prefix: fix Gentoo host shortcut path
Thanks flow for pointing out. Closes: https://bugs.gentoo.org/927957 Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-rwxr-xr-xscripts/bootstrap-prefix.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c3daad42ca..cb15d53cd6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1591,8 +1591,10 @@ bootstrap_stage1() {
# Host compiler can output a variety of libdirs. At stage1,
# they should be the same as lib. Otherwise libffi may not be
- # found by python.
- if is-rap ; then
+ # found by python. Don't do this when we're using a Gentoo host to
+ # speed up bootstrapping, it should be good, and we shouldn't be
+ # touching the host either. Bug #927957
+ if is-rap && [[ ! -L "${ROOT}"/tmp ]] ; then
[[ -d ${ROOT}/tmp/usr/lib ]] || mkdir -p "${ROOT}"/tmp/usr/lib
local libdir
for libdir in lib64 lib32 libx32; do