From 626e65009c7d73b47a36ac7e36dbe8547473f7be Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Mon, 26 Oct 2015 15:55:42 +0000 Subject: [PATCH] pseudolinkstubs.o needs MACHINE_ARCH in the name. --- app-tools/specs-stub.in | 2 +- platform/Makefile.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-tools/specs-stub.in b/app-tools/specs-stub.in index 62dddf9..8e35233 100644 --- a/app-tools/specs-stub.in +++ b/app-tools/specs-stub.in @@ -7,7 +7,7 @@ *lib: -L!DESTDIR!/lib/rumprun-!MACHINE_ARCH! \ --start-group -lpthread -lc --end-group \ - !DESTDIR!/lib/rumprun-pseudolinkstubs.o + !DESTDIR!/lib/rumprun-!MACHINE_ARCH!-pseudolinkstubs.o *link: %{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} %:replace-outfile(-lstdc++ -lc++) %{rdynamic:} diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 4fe7c5e..6e5bc55 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -60,7 +60,7 @@ $(eval $(call BUILDLIB_target,librumprun_tester)) $(eval $(call BUILDLIB_target,libunwind)) $(eval $(call BUILDLIB_target,libcompiler_rt,RUMPSRC=${RUMPSRC})) -PSEUDOSTUBS=${RROBJ}/rumprun-pseudolinkstubs +PSEUDOSTUBS=${RROBJ}/rumprun-${MACHINE_ARCH}-pseudolinkstubs ${PSEUDOSTUBS}.c: ${RROBJLIB}/librumprun_base/librumprun_base.a sh ../makepseudolinkstubs.sh ${NM} ${RUMPSRC} $< $@ -- 2.39.5