From 2b3d75bd5e7fb02e3c5ea735d4620adbd18ba913 Mon Sep 17 00:00:00 2001
From: Marco Fargetta <mfargett@redhat.com>
Date: Mon, 16 Dec 2024 11:51:06 +0100
Subject: [PATCH] Fix compiling option in RHEL-10

RHEL-10 requires cf protection and lto flags, similar to Fedora
---
 pki.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pki.spec b/pki.spec
index 40955f765b7..b0d74cfff57 100644
--- a/pki.spec
+++ b/pki.spec
@@ -1269,13 +1269,14 @@ popd
 C_FLAGS="-s"
 CXX_FLAGS="$CXX_FLAGS -g -fPIE -pie"
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} && 0%{?rhel} >= 10
 # https://sourceware.org/annobin/annobin.html/Test-gaps.html
 C_FLAGS="$C_FLAGS -fplugin=annobin"
 
 %ifarch x86_64
 # https://sourceware.org/annobin/annobin.html/Test-cf-protection.html
 C_FLAGS="$C_FLAGS -fcf-protection=full"
+CXX_FLAGS="$CXX_FLAGS -fcf-protection=full"
 %endif
 
 # https://sourceware.org/annobin/annobin.html/Test-optimization.html
@@ -1287,7 +1288,7 @@ C_FLAGS="$C_FLAGS -D_GLIBCXX_ASSERTIONS"
 CXX_FLAGS="$CXX_FLAGS -D_GLIBCXX_ASSERTIONS"
 
 # https://sourceware.org/annobin/annobin.html/Test-lto.html
-C_FLAGS="$C_FLAGS -fno-lto"
+C_FLAGS="$C_FLAGS -flto"
 
 # https://sourceware.org/annobin/annobin.html/Test-fortify.html
 C_FLAGS="$C_FLAGS -D_FORTIFY_SOURCE=3"