diff options
| author |   Joshua Kinard <kumba@gentoo.org> | 2023-10-01 23:18:37 -0400 |
|---|---|---|
| committer | Joshua Kinard <kumba@gentoo.org> | 2023-10-01 23:18:37 -0400 |
| commit | 67495c6078f95162d424d1c0942ad55c33a02149 (patch) | |
| tree | 22084afef830aa74f7b6d712665e95e259dd1b50 /scripts | |
| parent | sys-kernel/git-sources: add 6.6_rc4 (diff) | |
| download | gentoo-67495c6078f95162d424d1c0942ad55c33a02149.tar.gz gentoo-67495c6078f95162d424d1c0942ad55c33a02149.tar.bz2 gentoo-67495c6078f95162d424d1c0942ad55c33a02149.zip | |
scripts/bootstrap.sh: Don't bail if 'emerge --prune' returns 1
If 'emerge --prune' doesn't find any older gcc's to prune, it
will return '1', which causes bootstrap.sh to run the cleanup
method, and this results in catalyst aborting at the end of a
stage2 build. Removing the all to cleanup prevents this.
Issue was added due to resolution of Bug #851750.
Closes: https://bugs.gentoo.org/881839
Signed-off-by: Joshua Kinard <kumba@gentoo.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1e998075691a..48ed539e8186 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -351,7 +351,7 @@ if [[ -n ${STRAP_RUN} ]] ; then fi if [[ "${output}" = *'All selected packages:'* ]] ; then # Make sure we get the old gcc unmerged ... - ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune sys-devel/gcc || cleanup 1 + ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune sys-devel/gcc # Make sure the profile and /lib/cpp and /usr/bin/cc are valid ... ${GCC_CONFIG} "$(${GCC_CONFIG} --get-current-profile)" &>/dev/null fi |