diff options
| author | Havard Graff <havard.graff@gmail.com> | 2017-12-04 13:00:21 +0100 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-03-10 19:05:19 +0530 |
| commit | 9aabc17a8358676bd4c2eb83aa5552a5aebbd448 (patch) | |
| tree | 1fb54190b7c3e5fd6cdfbee15cd45620f132194e | |
| parent | d0104729f790ba9733a71d4cb62a67366bdbc133 (diff) | |
| download | gobject-introspection-9aabc17a8358676bd4c2eb83aa5552a5aebbd448.tar.gz | |
meson: add ffi_libdir to glib_libpaths and glib_command
To make it build using libffi as a subproject on Linux.
| -rw-r--r-- | gir/meson.build | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gir/meson.build b/gir/meson.build index 52838f23..a4c84c94 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -132,7 +132,6 @@ elif dep_type == 'internal' gio_libdir = join_paths(meson.build_root(), subprojdir, 'glib', 'gio') glib_libpaths = ['-L' + glib_libdir, '-L' + gobject_libdir, '-L' + gmodule_libdir, '-L' + gio_libdir] - glib_command += glib_libpaths # Includes that will be used to compile the scanner executable glib_buildinc = join_paths(meson.build_root(), subprojdir, 'glib') gmodule_incdir = join_paths(glibproj_incdir, 'gmodule') @@ -146,6 +145,12 @@ elif dep_type == 'internal' glib_includes += ['-I' + ffi_incdir] intl_incdir = join_paths(meson.source_root(), subprojdir, 'proxy-libintl') glib_includes += ['-I' + intl_incdir] + + ffi_libdir = join_paths(meson.build_root(), subprojdir, 'libffi', 'src') + glib_libpaths = ['-L' + ffi_libdir] + glib_libpaths + + glib_command += glib_libpaths + else error('Unknown glib dependency type: ' + dep_type) endif |