Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Thu, 30 Dec 2021 12:17:56
Message-Id: 1640866605.99c4d68466e7f6c5f9e927eef423527778653e84.grobian@gentoo
1 commit: 99c4d68466e7f6c5f9e927eef423527778653e84
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 30 12:16:45 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 30 12:16:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=99c4d684
7
8 scripts/bootstrap-prefix: don't use subshell for emerge -u system
9
10 we don't have to restore C*FLAGS, this is the end of stage3
11
12 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
13
14 scripts/bootstrap-prefix.sh | 6 ++----
15 1 file changed, 2 insertions(+), 4 deletions(-)
16
17 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
18 index 643d163211..70599da63a 100755
19 --- a/scripts/bootstrap-prefix.sh
20 +++ b/scripts/bootstrap-prefix.sh
21 @@ -2190,10 +2190,8 @@ bootstrap_stage3() {
22 # Portage should figure out itself what it needs to do, if anything.
23 einfo "running emerge -uDNv system"
24 estatus "stage3: emerge -uDNv system"
25 - (
26 - unset CFLAGS CXXFLAGS CPPFLAGS
27 - emerge --color n -uDNv system
28 - ) || return 1
29 + unset CFLAGS CXXFLAGS CPPFLAGS
30 + emerge --color n -uDNv system || return 1
31
32 # remove anything that we don't need (compilers most likely)
33 einfo "running emerge --depclean"