From f68ad3cca2b1eb22bda2bb79cb683d1eda488807 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Mon, 15 Jan 2024 16:56:32 +0100
Subject: [PATCH] PGO: Use env variables with fprofile-use instead of %q{VAR}

---
 scram-project-build.file                       | 2 +-
 scram-tools.file/tools/gcc/gcc-cxxcompiler.xml | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/scram-project-build.file b/scram-project-build.file
index 0036cf35466..2ba6047e22e 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -55,7 +55,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V09-01-07
+%define configtag       V09-01-08
 %endif
 
 %if "%{?buildarch:set}" != "set"
diff --git a/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml b/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml
index ce58143a114..497587c2002 100644
--- a/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml
+++ b/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml
@@ -26,9 +26,8 @@
     <flags CXXFLAGS="@GCC_WARNINGS@"/>
     <flags LTO_FLAGS="@LTO_FLAGS@"/>
     <flags PGO_FLAGS="-fprofile-prefix-path=$(LOCALTOP) -fprofile-update=prefer-atomic -fprofile-correction"/>
-    <flags PGO_FLAGS="-fprofile-dir=%q{CMSSW_PGO_DIRECTORY}/PGO-Profiles/cmssw/%q{CMSSW_CPU_TYPE}"/>
-    <flags PGO_GENERATE_FLAGS="-fprofile-generate"/>
-    <flags PGO_USE_FLAGS="-fprofile-use -fprofile-partial-training -Wno-missing-profile"/>
+    <flags PGO_GENERATE_FLAGS="-fprofile-generate=%q{CMSSW_PGO_DIRECTORY}/PGO-Profiles/cmssw/%q{CMSSW_CPU_TYPE}"/>
+    <flags PGO_USE_FLAGS="-fprofile-use=@{CMSSW_PGO_DIRECTORY}/PGO-Profiles/cmssw/@{CMSSW_CPU_TYPE} -fprofile-partial-training"/>
     <flags LDFLAGS="@GCC_LDFLAGS@"/>
     <flags CXXSHAREDFLAGS="@GCC_SHAREDFLAGS@"/>
     <flags LD_UNIT="@GCC_LD_UNIT@"/>