diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2019-01-02 12:41:38 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-01-05 21:44:53 +0200 |
| commit | 83964f64fa193669ad7543c618568b115c2b212b (patch) | |
| tree | 24aeaedde1065b35df136b369cd8273354b5ebf8 /mesonbuild/modules/pkgconfig.py | |
| parent | 1aca899a63ef287c6fb06e5383f6355b5e75d6d2 (diff) | |
| download | meson-83964f64fa193669ad7543c618568b115c2b212b.zip meson-83964f64fa193669ad7543c618568b115c2b212b.tar.gz meson-83964f64fa193669ad7543c618568b115c2b212b.tar.bz2 | |
pkgconfig: Fix flag deduplication
This is a regression introduced by 2cbf7caf5, generated pkg-config files
have many duplicated '-pthread' flags.
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 47edeee..bc9bff8 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -192,7 +192,11 @@ class DependenciesHelper: for x in xs: # Don't de-dup unknown strings to avoid messing up arguments like: # ['-framework', 'CoreAudio', '-framework', 'CoreMedia'] - if x not in result or (libs and (isinstance(x, str) and not x.endswith(('-l', '-L')))): + known_flags = ['-pthread'] + cannot_dedup = libs and isinstance(x, str) and \ + not x.startswith(('-l', '-L')) and \ + x not in known_flags + if x not in result or cannot_dedup: result.append(x) return result self.pub_libs = _fn(self.pub_libs, True) |