aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend
diff options
context:
space:
mode:
authorAlistair Thomas <astavale@yahoo.co.uk>2017-10-03 19:14:43 +0100
committerCorentin Noël <corentin@elementary.io>2017-10-03 20:43:11 +0200
commitd551dbff9a1c5948d4de036f4c7e2cab12a9476c (patch)
tree8c3357dd5493817d00fa330c7efc1dbf3e55314b /mesonbuild/backend
parent6483a0d8466635ae01373bb469fa98ec44c212e9 (diff)
downloadmeson-d551dbff9a1c5948d4de036f4c7e2cab12a9476c.zip
meson-d551dbff9a1c5948d4de036f4c7e2cab12a9476c.tar.gz
meson-d551dbff9a1c5948d4de036f4c7e2cab12a9476c.tar.bz2
Use long form of valac options and make --basedir use relative path
Diffstat (limited to 'mesonbuild/backend')
-rw-r--r--mesonbuild/backend/ninjabackend.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 5d02991..bb281e1 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -1148,14 +1148,14 @@ int dummy;
# Tell Valac to output everything in our private directory. Sadly this
# means it will also preserve the directory components of Vala sources
# found inside the build tree (generated sources).
- args += ['-d', c_out_dir]
- args += ['-b', os.path.join(self.environment.get_source_dir(), target.get_subdir())]
+ args += ['--directory', c_out_dir]
+ args += ['--basedir', os.path.join(self.build_to_src, target.get_subdir())]
if not isinstance(target, build.Executable):
# Library name
- args += ['--library=' + target.name]
+ args += ['--library', target.name]
# Outputted header
hname = os.path.join(self.get_target_dir(target), target.vala_header)
- args += ['-H', hname]
+ args += ['--header', hname]
if self.is_unity(target):
# Without this the declarations will get duplicated in the .c
# files and cause a build failure when all of them are