diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch b/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch new file mode 100644 index 0000000000..97778c32eb --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 4676224dbdff0f7107e8cbdbe0eab19c855f1454 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 17 Nov 2017 13:18:28 +0200 | ||
4 | Subject: [PATCH] Linker rules: move {cross_args} in front of {output_args} | ||
5 | |||
6 | The previous order was found to break linking in some cases | ||
7 | (e.g. when -no-pic -fno-PIC was present in {cross_args}. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | mesonbuild/backend/ninjabackend.py | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py | ||
16 | index bb281e1..969b70e 100644 | ||
17 | --- a/mesonbuild/backend/ninjabackend.py | ||
18 | +++ b/mesonbuild/backend/ninjabackend.py | ||
19 | @@ -1501,7 +1501,7 @@ int dummy; | ||
20 | rspfile_content = $ARGS {output_args} $in $LINK_ARGS {cross_args} $aliasing | ||
21 | ''' | ||
22 | else: | ||
23 | - command_template = ' command = {executable} $ARGS {output_args} $in $LINK_ARGS {cross_args} $aliasing\n' | ||
24 | + command_template = ' command = {executable} $ARGS {cross_args} {output_args} $in $LINK_ARGS $aliasing\n' | ||
25 | command = command_template.format( | ||
26 | executable=' '.join(compiler.get_linker_exelist()), | ||
27 | cross_args=' '.join(cross_args), | ||
28 | -- | ||
29 | 2.15.0 | ||
30 | |||