commit:     f75639b635eacab161f65103ae4c53a3edffe816
Author:     Leonardo Hernández Hernández <leohdz172 <AT> protonmail <DOT> com>
AuthorDate: Tue Dec 13 21:59:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 05:31:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75639b6

app-shells/bash: fix build with clang and USE=pgo

Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28659
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-shells/bash/bash-5.2_p15.ebuild | 2 ++
 app-shells/bash/bash-9999.ebuild    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app-shells/bash/bash-5.2_p15.ebuild 
b/app-shells/bash/bash-5.2_p15.ebuild
index 3aa6795a6431..e0c1c5ecc52e 100644
--- a/app-shells/bash/bash-5.2_p15.ebuild
+++ b/app-shells/bash/bash-5.2_p15.ebuild
@@ -246,6 +246,8 @@ 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
+
                # Rebuild Bash using the profiling data we just generated.
                emake clean
                emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo"

diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 5fecc6b0353c..c082c658b1aa 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -246,6 +246,8 @@ 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
+
                # Rebuild Bash using the profiling data we just generated.
                emake clean
                emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo 
-fprofile-dir=${T}/pgo"

Reply via email to