commit: 13d407057928f96ce29ef4988b7bd4400db8c060 Author: Leonardo Hernández Hernández <leohdz172 <AT> protonmail <DOT> com> AuthorDate: Fri Jan 6 16:37:54 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 7 00:06:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13d40705
app-shells/bash: fix build with gcc and USE=pgo Closes: https://bugs.gentoo.org/889848 Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/28985 Signed-off-by: Sam James <sam <AT> gentoo.org> app-shells/bash/bash-5.2_p15.ebuild | 4 +++- app-shells/bash/bash-9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app-shells/bash/bash-5.2_p15.ebuild b/app-shells/bash/bash-5.2_p15.ebuild index a1a2a14ae0e4..9dbde4810a73 100644 --- a/app-shells/bash/bash-5.2_p15.ebuild +++ b/app-shells/bash/bash-5.2_p15.ebuild @@ -246,7 +246,9 @@ src_compile() { emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo" -k check - tc-is-clang && llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die + if tc-is-clang; then + llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die + fi # Rebuild Bash using the profiling data we just generated. emake clean diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild index b0207e51036e..b491dd7b04e3 100644 --- a/app-shells/bash/bash-9999.ebuild +++ b/app-shells/bash/bash-9999.ebuild @@ -246,7 +246,9 @@ src_compile() { emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo" -k check - tc-is-clang && llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die + if tc-is-clang; then + llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die + fi # Rebuild Bash using the profiling data we just generated. emake clean