zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clingo-bootstrap: fix +optimized build (#48931)

Browse Source 
* fix regression `apple-clang` vs `%apple-clang`
* use f-strings
* remove --verbose flag from LDFLAGS
This commit is contained in:
Harmen Stoppels 2025-02-07 09:46:05 +01:00 committed by GitHub
parent bcd40835a0
commit 97750189b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/clingo-bootstrap/package.py
View File

@ -92,9 +92,9 @@ def pgo_train(self):
# Set PGO training flags. # Set PGO training flags.
generate_mods = EnvironmentModifications() generate_mods = EnvironmentModifications()
generate_mods.append_flags("CFLAGS", "-fprofile-generate={}".format(reports)) generate_mods.append_flags("CFLAGS", f"-fprofile-generate={reports}")
generate_mods.append_flags("CXXFLAGS", "-fprofile-generate={}".format(reports)) generate_mods.append_flags("CXXFLAGS", f"-fprofile-generate={reports}")
generate_mods.append_flags("LDFLAGS", "-fprofile-generate={} --verbose".format(reports)) generate_mods.append_flags("LDFLAGS", f"-fprofile-generate={reports}")
with working_dir(self.build_directory, create=True): with working_dir(self.build_directory, create=True):
cmake(*cmake_options, sources, extra_env=generate_mods) cmake(*cmake_options, sources, extra_env=generate_mods)
@ -118,14 +118,14 @@ def pgo_train(self):
# Clean the build dir. # Clean the build dir.
rmtree(self.build_directory, ignore_errors=True) rmtree(self.build_directory, ignore_errors=True)
if self.spec.satisfies("%clang") or self.spec.satisfies("apple-clang"): if self.spec.satisfies("%clang") or self.spec.satisfies("%apple-clang"):
# merge reports # merge reports
use_report = join_path(reports, "merged.prof") use_report = join_path(reports, "merged.prof")
raw_files = glob.glob(join_path(reports, "*.profraw")) raw_files = glob.glob(join_path(reports, "*.profraw"))
llvm_profdata("merge", "--output={}".format(use_report), *raw_files) llvm_profdata("merge", f"--output={use_report}", *raw_files)
use_flag = "-fprofile-instr-use={}".format(use_report) use_flag = f"-fprofile-instr-use={use_report}"
else: else:
use_flag = "-fprofile-use={}".format(reports) use_flag = f"-fprofile-use={reports}"
# Set PGO use flags for next cmake phase. # Set PGO use flags for next cmake phase.
use_mods = EnvironmentModifications() use_mods = EnvironmentModifications()