summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2025-05-19 11:34:37 -0700
committerEli Schwartz <eschwartz93@gmail.com>2025-06-05 16:24:00 -0400
commitd01cce9b1e47feb131af0c644d02e58b62a7a6e7 (patch)
tree4b7ceeec38c3053ed53bba543128507b1ec128f7
parent75f79fc234437ee5f95686432619397e936bcd92 (diff)
downloadmeson-d01cce9b1e47feb131af0c644d02e58b62a7a6e7.tar.gz
build: fix tasking compiler b_lto support after option refactor
The weird format is to minimize the diff in the next fixup patch.
-rw-r--r--mesonbuild/build.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 8049f160d..a7dfc890c 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -2181,10 +2181,10 @@ class StaticLibrary(BuildTarget):
elif self.rust_crate_type == 'staticlib':
self.suffix = 'a'
else:
- if 'c' in self.compilers and self.compilers['c'].get_id() == 'tasking':
- self.suffix = 'ma' if self.options.get_value('b_lto') and not self.prelink else 'a'
- else:
- self.suffix = 'a'
+ self.suffix = 'a'
+ if 'c' in self.compilers and self.compilers['c'].get_id() == 'tasking' and not self.prelink:
+ if self.environment.coredata.optstore.get_value_for(OptionKey('b_lto'), self.subproject):
+ self.suffix = 'ma'
self.filename = self.prefix + self.name + '.' + self.suffix
self.outputs[0] = self.filename