aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjpakkane <jpakkane@gmail.com>2015-05-29 23:21:20 +0300
committerjpakkane <jpakkane@gmail.com>2015-05-29 23:21:20 +0300
commitb896af9c5fdd8386b7ee5ca965eae21506c6d64d (patch)
treec34ce63abdac02962b5532e67ca15dfaa3756906
parentb03ee73ace4f561f7138db1b3762966a4b959e7c (diff)
parent0a726413ae4f224d344dc95d9cb96122c5161e8d (diff)
downloadmeson-b896af9c5fdd8386b7ee5ca965eae21506c6d64d.zip
meson-b896af9c5fdd8386b7ee5ca965eae21506c6d64d.tar.gz
meson-b896af9c5fdd8386b7ee5ca965eae21506c6d64d.tar.bz2
Merge pull request #133 from MathieuDuponchelle/no_pedantic
backends: Add extra args after compiler.std_warn_args.
-rw-r--r--authors.txt1
-rw-r--r--backends.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/authors.txt b/authors.txt
index b3f0ddc..1bbc557 100644
--- a/authors.txt
+++ b/authors.txt
@@ -16,3 +16,4 @@ mfrischknecht
Matthew Bekkema
Afief Halumi
Thibault Saunier
+Mathieu Duponchelle
diff --git a/backends.py b/backends.py
index 88f144d..c4ee0bb 100644
--- a/backends.py
+++ b/backends.py
@@ -196,9 +196,9 @@ class Backend():
commands += compiler.get_always_args()
commands += self.build.get_global_args(compiler)
commands += self.environment.coredata.external_args[compiler.get_language()]
- commands += target.get_extra_args(compiler.get_language())
if self.environment.coredata.buildtype != 'plain':
commands += compiler.get_std_warn_args()
+ commands += target.get_extra_args(compiler.get_language())
commands += compiler.get_buildtype_args(self.environment.coredata.buildtype)
if self.environment.coredata.coverage:
commands += compiler.get_coverage_args()