aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-03-23 08:34:42 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2017-03-23 10:26:29 +0530
commitb35a808972a4a51438e0c76f117c557fe3a1ffa1 (patch)
tree5316700a0bf4418cb7cf0cc94e07c3ca5da1218c
parent7f80f81ac9c00ed328566d9aec5140b4f9d1d21d (diff)
downloadmeson-b35a808972a4a51438e0c76f117c557fe3a1ffa1.zip
meson-b35a808972a4a51438e0c76f117c557fe3a1ffa1.tar.gz
meson-b35a808972a4a51438e0c76f117c557fe3a1ffa1.tar.bz2
compiler args: Also dedup -pthread since it can't be undone
-rw-r--r--mesonbuild/compilers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index f8c3f6b..e814693 100644
--- a/mesonbuild/compilers.py
+++ b/mesonbuild/compilers.py
@@ -369,7 +369,7 @@ class CompilerArgs(list):
dedup2_args = ()
# Arg prefixes and args that must be de-duped by returning 1
dedup1_prefixes = ()
- dedup1_args = ('-c', '-S', '-E', '-pipe')
+ dedup1_args = ('-c', '-S', '-E', '-pipe', '-pthread')
compiler = None
def _check_args(self, args):
@@ -413,7 +413,7 @@ class CompilerArgs(list):
can safely remove the previous occurance and add a new one. The same
is true for include paths and library paths with -I and -L. For
these we return `2`. See `dedup2_prefixes` and `dedup2_args`.
- b) Arguments that once specifie cannot be undone, such as `-c` or
+ b) Arguments that once specified cannot be undone, such as `-c` or
`-pipe`. New instances of these can be completely skipped. For these
we return `1`. See `dedup1_prefixes` and `dedup1_args`.
c) Whether it matters where or how many times on the command-line