diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2018-12-30 23:04:59 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-01-06 12:19:33 +0100 |
| commit | bd8bad46c3fad6e53e259f73408a73eeca920dc7 (patch) | |
| tree | b9d676368f645caa0c532067473c0b6485d518a5 /mesonbuild/backend/ninjabackend.py | |
| parent | 248adbab9ad0775e513b920e9047b2e93664ae2e (diff) | |
| download | meson-bd8bad46c3fad6e53e259f73408a73eeca920dc7.zip meson-bd8bad46c3fad6e53e259f73408a73eeca920dc7.tar.gz meson-bd8bad46c3fad6e53e259f73408a73eeca920dc7.tar.bz2 | |
Code cleanup and renamed variables
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 23da39e..b7df33a 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -343,7 +343,7 @@ int dummy; lang = comp.get_language() tgt = self.introspection_data[id] # Find an existing entry or create a new one - id_hash = (lang, CompilerArgs) + id_hash = (lang, parameters) src_block = tgt.get(id_hash, None) if src_block is None: # Convert parameters @@ -351,7 +351,7 @@ int dummy; parameters = parameters.to_native(copy=True) parameters = comp.compute_parameters_with_absolute_paths(parameters, self.build_dir) if target.is_cross: - parameters += comp.get_cross_extra_flags(self.environment, False) + parameters.insert(0, comp.get_cross_extra_flags(self.environment, False)) # The new entry src_block = { 'language': lang, @@ -360,7 +360,6 @@ int dummy; 'sources': [], 'generated_sources': [], } - self._intro_last_index = len(tgt) tgt[id_hash] = src_block # Make source files absolute sources = [x.absolute_path(self.source_dir, self.build_dir) if isinstance(x, File) else os.path.normpath(os.path.join(self.build_dir, x)) |