diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-25 18:55:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-25 18:55:47 +0200 |
| commit | d668bea11dbc7140459ad8f9e326cbe0aa1e738f (patch) | |
| tree | 23391a9d61ee061eae7cbc8b76c66d412472c19d /mesonbuild/compilers.py | |
| parent | aeb694d9c379fbf7c4d01c3848e6441d690ce492 (diff) | |
| parent | b35a808972a4a51438e0c76f117c557fe3a1ffa1 (diff) | |
| download | meson-d668bea11dbc7140459ad8f9e326cbe0aa1e738f.zip meson-d668bea11dbc7140459ad8f9e326cbe0aa1e738f.tar.gz meson-d668bea11dbc7140459ad8f9e326cbe0aa1e738f.tar.bz2 | |
Merge pull request #1496 from centricular/fix-internal-dep-order
Preserve internal-dep include order in build target dependencies
Diffstat (limited to 'mesonbuild/compilers.py')
| -rw-r--r-- | mesonbuild/compilers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 519a7d5..85b56a6 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 |