diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch index 57cb678f2c..7ffd6c54cb 100644 --- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch | |||
@@ -35,32 +35,6 @@ index cb69641..727eb6a 100644 | |||
35 | args += self._unpack_args('--htmlargs=', 'html_args', kwargs) | 35 | args += self._unpack_args('--htmlargs=', 'html_args', kwargs) |
36 | args += self._unpack_args('--scanargs=', 'scan_args', kwargs) | 36 | args += self._unpack_args('--scanargs=', 'scan_args', kwargs) |
37 | args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs) | 37 | args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs) |
38 | @@ -854,14 +858,22 @@ This will become a hard error in the future.''') | ||
39 | ldflags.update(internal_ldflags) | ||
40 | ldflags.update(state.environment.coredata.get_external_link_args('c')) | ||
41 | ldflags.update(external_ldflags) | ||
42 | + | ||
43 | + cross_c_args = " ".join(state.environment.cross_info.config["properties"].get('c_args', "")) | ||
44 | + cross_link_args = " ".join(state.environment.cross_info.config["properties"].get('c_link_args', "")) | ||
45 | + | ||
46 | if cflags: | ||
47 | - args += ['--cflags=%s' % ' '.join(cflags)] | ||
48 | + args += ['--cflags=%s %s' % (cross_c_args,' '.join(cflags))] | ||
49 | if ldflags: | ||
50 | - args += ['--ldflags=%s' % ' '.join(ldflags)] | ||
51 | + args += ['--ldflags=%s %s' % (cross_link_args, ' '.join(ldflags))] | ||
52 | compiler = state.environment.coredata.compilers.get('c') | ||
53 | - if compiler: | ||
54 | + cross_compiler = state.environment.coredata.cross_compilers.get('c') | ||
55 | + if compiler and not state.environment.is_cross_build(): | ||
56 | args += ['--cc=%s' % ' '.join(compiler.get_exelist())] | ||
57 | args += ['--ld=%s' % ' '.join(compiler.get_linker_exelist())] | ||
58 | + elif cross_compiler and state.environment.is_cross_build(): | ||
59 | + args += ['--cc=%s' % ' '.join(cross_compiler.get_exelist())] | ||
60 | + args += ['--ld=%s' % ' '.join(cross_compiler.get_linker_exelist())] | ||
61 | |||
62 | return args | ||
63 | |||
64 | diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py | 38 | diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py |
65 | index 948dc5a..9c5bd19 100644 | 39 | index 948dc5a..9c5bd19 100644 |
66 | --- a/mesonbuild/scripts/gtkdochelper.py | 40 | --- a/mesonbuild/scripts/gtkdochelper.py |