diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-12 18:45:24 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-12 18:46:51 +0200 |
| commit | 1e0ae0a083cc454dad64f9195e7b5e08b80f9bd9 (patch) | |
| tree | fcc6274e450d7c9666a6f44acbae5f2a981b04ad | |
| parent | 45996b0f92cf9fa56c6bcbd47d1d5035a95d36df (diff) | |
| download | meson-1e0ae0a083cc454dad64f9195e7b5e08b80f9bd9.zip meson-1e0ae0a083cc454dad64f9195e7b5e08b80f9bd9.tar.gz meson-1e0ae0a083cc454dad64f9195e7b5e08b80f9bd9.tar.bz2 | |
Revert "vala: Build with '--nostdpkg'", MR #920
This reverts commit 0f098c37ae3f257649eae7566391ad74b7010c45.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 1 | ||||
| -rw-r--r-- | test cases/vala/11 mixed sources/meson.build | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index c854f1b..76f47ab 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1024,7 +1024,6 @@ int dummy; # found inside the build tree (generated sources). args += ['-d', c_out_dir] args += ['-C'] - args += ['--nostdpkg'] if not isinstance(target, build.Executable): # Library name args += ['--library=' + target.name] diff --git a/test cases/vala/11 mixed sources/meson.build b/test cases/vala/11 mixed sources/meson.build index 1aecd44..75b8ecd 100644 --- a/test cases/vala/11 mixed sources/meson.build +++ b/test cases/vala/11 mixed sources/meson.build @@ -1,8 +1,7 @@ project('foo', 'c', 'vala') glib = dependency('glib-2.0') -gobject = dependency('gobject-2.0') subdir('c') -e = executable('foo', 'c/foo.c', retval, 'vala/bar.vala', dependencies: [glib, gobject]) +e = executable('foo', 'c/foo.c', retval, 'vala/bar.vala', dependencies: [glib]) test('test foo', e) |