aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorPatrick Griffis <tingping@tingping.se>2017-04-02 12:58:34 -0400
committerPatrick Griffis <tingping@tingping.se>2017-05-08 15:25:52 -0400
commitb520a4f030701089b7eca8bf00d49d143db5ba8b (patch)
treeb4909cc4d91de953e7eac87596ea7542e2afd761 /mesonbuild
parent7053d9abfdef64c1f507173609fad4c9866441eb (diff)
downloadmeson-b520a4f030701089b7eca8bf00d49d143db5ba8b.zip
meson-b520a4f030701089b7eca8bf00d49d143db5ba8b.tar.gz
meson-b520a4f030701089b7eca8bf00d49d143db5ba8b.tar.bz2
rust: Support rust_args
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/ninjabackend.py1
-rw-r--r--mesonbuild/build.py5
2 files changed, 6 insertions, 0 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index bbae408..34cf74e 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -1170,6 +1170,7 @@ int dummy;
args += rustc.get_buildtype_args(self.get_option_for_target('buildtype', target))
depfile = os.path.join(target.subdir, target.name + '.d')
args += ['--emit', 'dep-info={}'.format(depfile), '--emit', 'link']
+ args += target.get_extra_args('rust')
args += ['-o', os.path.join(target.subdir, target.get_filename())]
orderdeps = [os.path.join(t.subdir, t.get_filename()) for t in target.link_targets]
linkdirs = OrderedDict()
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 0d58394..c6c712f 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -34,6 +34,7 @@ known_basic_kwargs = {'install': True,
'fortran_args': True,
'd_args': True,
'java_args': True,
+ 'rust_args': True,
'link_args': True,
'link_depends': True,
'link_with': True,
@@ -632,6 +633,10 @@ class BuildTarget(Target):
if not isinstance(fortranlist, list):
fortranlist = [fortranlist]
self.add_compiler_args('fortran', fortranlist)
+ rustlist = kwargs.get('rust_args', [])
+ if not isinstance(rustlist, list):
+ rustlist = [rustlist]
+ self.add_compiler_args('rust', rustlist)
if not isinstance(self, Executable):
self.vala_header = kwargs.get('vala_header', self.name + '.h')
self.vala_vapi = kwargs.get('vala_vapi', self.name + '.vapi')