aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Duponchelle <mathieu.duponchelle@opencreed.com>2015-05-24 17:46:43 +0200
committerMathieu Duponchelle <mathieu.duponchelle@opencreed.com>2015-05-29 22:13:59 +0200
commit0a726413ae4f224d344dc95d9cb96122c5161e8d (patch)
tree15d55fd8bb72779a96573e57d869684df2549976
parentba1e9cd4f109e78a869a99e29b9d9504f2c4a8b5 (diff)
downloadmeson-0a726413ae4f224d344dc95d9cb96122c5161e8d.zip
meson-0a726413ae4f224d344dc95d9cb96122c5161e8d.tar.gz
meson-0a726413ae4f224d344dc95d9cb96122c5161e8d.tar.bz2
backends: Add extra args after compiler.std_warn_args.
This to give a chance to the application to disable pedantic for example.
-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()