diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2012-06-08 16:57:56 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-11 13:49:52 +0100 |
commit | a166085ff31efe7f1ef604f10aaad1294fced5e0 (patch) | |
tree | f4afec6418264045e8f0267e88f937de350f245b /meta/recipes-bsp/v86d/v86d | |
parent | 616fab3981c3497559bd248ef18e8a26e1f3a2e0 (diff) | |
download | poky-a166085ff31efe7f1ef604f10aaad1294fced5e0.tar.gz |
v86d: Fix cross link using host-cross ar
If building on 32bit host and creating 64bit libraries, the target
package builds should not invoke the 32bit hosts's ar. Specifically
you will get an error message like:
x86_64-linux-gcc -m64 --sysroot=/opt/qemux86-64/tmp/sysroots/qemux86-64 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Llibs/x86emu v86_x86emu.o v86_mem.o v86_common.o v86.o -lx86emu -o v86d
libs/x86emu/libx86emu.a: could not read symbols: Archive has no index; run ranlib to add one
collect2: error: ld returned 1 exit status
(From OE-Core rev: 4bb926513084dfa6ebf5598a177239315530276e)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/v86d/v86d')
-rw-r--r-- | meta/recipes-bsp/v86d/v86d/ar-from-env.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-bsp/v86d/v86d/ar-from-env.patch b/meta/recipes-bsp/v86d/v86d/ar-from-env.patch new file mode 100644 index 0000000000..1dcbc71dcc --- /dev/null +++ b/meta/recipes-bsp/v86d/v86d/ar-from-env.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | Fix cross link using host-cross ar | ||
2 | |||
3 | If building on 32bit host and creating 64bit libraries, the target | ||
4 | package builds should not invoke the 32bit hosts's ar. Specifically | ||
5 | you will get an error message like: | ||
6 | |||
7 | x86_64-linux-gcc -m64 --sysroot=/opt/qemux86-64/tmp/sysroots/qemux86-64 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Llibs/x86emu v86_x86emu.o v86_mem.o v86_common.o v86.o -lx86emu -o v86d | ||
8 | libs/x86emu/libx86emu.a: could not read symbols: Archive has no index; run ranlib to add one | ||
9 | collect2: error: ld returned 1 exit status | ||
10 | |||
11 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | --- | ||
16 | libs/x86emu/Makefile | 6 +++++- | ||
17 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
18 | |||
19 | --- a/libs/x86emu/Makefile | ||
20 | +++ b/libs/x86emu/Makefile | ||
21 | @@ -1,7 +1,11 @@ | ||
22 | OBJS = decode.o fpu.o ops.o ops2.o prim_ops.o sys.o | ||
23 | |||
24 | +ifeq ($(AR),) | ||
25 | + AR = ar | ||
26 | +endif | ||
27 | + | ||
28 | libx86emu.a: $(OBJS) | ||
29 | - ar rv $@ $+ | ||
30 | + $(AR) rv $@ $+ | ||
31 | |||
32 | %.o: %.c | ||
33 | $(CC) -c $(CFLAGS) -o $@ $< | ||