diff options
| author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-06-09 22:40:23 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-06-11 01:42:59 +0300 |
| commit | 18b99b3bc319f84db78ff489d6ca5e0cc0273bcc (patch) | |
| tree | 973c5b66ad0424feb6dfa839f82fb5fd2053d9d2 /mesonbuild/compilers/compilers.py | |
| parent | 71d68a940bdb31f0d66448fa9bde9abf403b54f2 (diff) | |
| download | meson-18b99b3bc319f84db78ff489d6ca5e0cc0273bcc.zip meson-18b99b3bc319f84db78ff489d6ca5e0cc0273bcc.tar.gz meson-18b99b3bc319f84db78ff489d6ca5e0cc0273bcc.tar.bz2 | |
compilers: corretify deduplication direction
so: when building compile args, meson is deduplicating flags. When a
compiler argument is appended, a later appearance of a dedup'ed is going
to remove a earlier one. If the argument is prepended, the element
*before* the new one is going to be removed. And that is where the
problem reported in https://github.com/mesonbuild/meson/pull/7119 is
coming in. In the revision linked there, the order of replacement in the
prepend case was revesered.
With this patch, we restore this behaviour again.
Diffstat (limited to 'mesonbuild/compilers/compilers.py')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 50e2188..f427262 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -481,10 +481,10 @@ class CompilerArgs(collections.abc.MutableSequence): post_flush_set = set() #The two lists are here walked from the front to the back, in order to not need removals for deduplication - for a in reversed(self.pre): + for a in self.pre: dedup = self._can_dedup(a) if a not in pre_flush_set: - pre_flush.appendleft(a) + pre_flush.append(a) if dedup == 2: pre_flush_set.add(a) for a in reversed(self.post): |