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

[Fabian Groffen]

commit:     b1e6f8f2c4e3b3cbf5e911b6d2bd970cb244028d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  3 10:48:05 2025 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Aug  3 10:48:05 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b1e6f8f2

scripts/bootstrap-prefix: also don't require zstd for GCC build

stage2:
like binutils, don't expect libzstd to exist for gcc either

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

 scripts/bootstrap-prefix.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2ccdf2dd28..1ebdde823a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2086,11 +2086,17 @@ bootstrap_stage2() {
                echo "sys-devel/gcc -pie" >> 
"${ROOT}"/tmp/etc/portage/package.use
        fi
 
-       # don't use CET/ZSTD, we don't know if the host (and compiler) supports 
it
-       echo "sys-devel/binutils -cet -zstd" >> \
-               "${ROOT}"/tmp/etc/portage/profile/package.use.force
-       echo "sys-devel/binutils-cet zstd" >> \
-               "${ROOT}"/tmp/etc/portage/profile/package.use.mask
+       # don't use zstd at this point, the host may not have it installed
+       # don't use CET with binutils, we don't know if the host compiler
+       # supports it
+       {
+               echo "sys-devel/binutils -cet -zstd"
+               echo "sys-devel/gcc -zstd"
+       } >> "${ROOT}"/tmp/etc/portage/profile/package.use.force
+       {
+               echo "sys-devel/binutils cet zstd"
+               echo "sys-devel/gcc zstd"
+       } >> "${ROOT}"/tmp/etc/portage/profile/package.use.mask
 
        emerge_pkgs --nodeps "${pkgs[@]}" || return 1