commit:     503cfcdf2f49a3b450d5828b1b3ad0d70ac0688e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 13 11:04:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 13 11:04:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=503cfcdf

Revert "scripts/bootstrap-prefix.sh: don't unset *FLAGS for stage3 @system"

Need to discuss this more with grobian, but I'd misunderstood
where we do this (it's _before_ the -e @system, not _after_,
so it's not like it's just before the user might update
their system anyway).

coreutils (and possibly libtasn1) are still broken but
I'm not convinced this is the right fix after grobian@
raised concerns.

Will revisit shortly but reverting for now to avoid
problems.

This reverts commit a3175e08822394188b112dc5e23475e876cd603e.

Bug: https://github.com/gentoo/prefix/pull/5
Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ece81d3791..65f56ab99b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2171,7 +2171,7 @@ bootstrap_stage3() {
        einfo "running emerge -uDNav system"
        estatus "stage3: emerge -uDNav system"
        CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
-       emerge --color n -uDNav system || return 1
+       CFLAGS= CXXFLAGS= emerge --color n -uDNav system || return 1
 
        # remove anything that we don't need (compilers most likely)
        einfo "running emerge --depclean"

Reply via email to