diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2020-03-05 09:50:30 -0800 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2020-03-05 09:58:52 -0800 |
commit | 06b1a317d26cbe2a1bd7a232dd9726590d0c0a48 (patch) | |
tree | a2adf1f707779f18e226bf39c34447d229e71758 /mesonbuild/backend/ninjabackend.py | |
parent | 4d6ac91f950380d8262c13ce529ac0d6d8f6f4ba (diff) | |
download | meson-06b1a317d26cbe2a1bd7a232dd9726590d0c0a48.zip meson-06b1a317d26cbe2a1bd7a232dd9726590d0c0a48.tar.gz meson-06b1a317d26cbe2a1bd7a232dd9726590d0c0a48.tar.bz2 |
Make use of unholder
We have a lot of cases of code like:
```python
if hasattr(var, 'held_object'):
var = var.held_object`
```
replace that with the unholder function.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 24c91f3..c80d832 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -32,7 +32,8 @@ from ..compilers import (Compiler, CompilerArgs, CCompiler, FortranCompiler, PGICCompiler, VisualStudioLikeCompiler) from ..linkers import ArLinker from ..mesonlib import ( - File, LibType, MachineChoice, MesonException, OrderedSet, PerMachine, ProgressBar, quote_arg + File, LibType, MachineChoice, MesonException, OrderedSet, PerMachine, + ProgressBar, quote_arg, unholder, ) from ..mesonlib import get_compiler_for_source, has_path_sep from .backends import CleanTrees @@ -648,9 +649,7 @@ int dummy; self.generate_target(t) def custom_target_generator_inputs(self, target): - for s in target.sources: - if hasattr(s, 'held_object'): - s = s.held_object + for s in unholder(target.sources): if isinstance(s, build.GeneratedList): self.generate_genlist_for_target(s, target) |