install & use pseudostubs object from destdir

diff --git a/app-tools/specs-stub.in b/app-tools/specs-stub.in
index cd18909000d9e0d248d05aadf1dac958a9327b7a..1cf044140d9e4f0b261452df5632016887e5d0a5 100644 (file)
--- a/app-tools/specs-stub.in
+++ b/app-tools/specs-stub.in
@@ -6,7 +6,7 @@
 
 *lib:
 -L!DESTDIR!/lib --start-group -lpthread -lc --end-group        \
-    !BASE_DIR!/platform/pseudolinkstubs.o
+    !DESTDIR!/lib/rumprun-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 093db8b10450e53ba7658a0ffc2ebfe4bf45c87f..7c5f878f2bb8840202035f46612d09cb28e95712 100644 (file)
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -24,11 +24,13 @@ $(eval $(call BUILDLIB_target,${COREDIR},libbmk_core.a))
 $(eval $(call BUILDLIB_target,${RUMPUSERDIR},libbmk_rumpuser.a))
 $(eval $(call BUILDLIB_target,${COMPILERRTDIR},libcompiler_rt.a,RUMPSRC=${RUMPSRC}))
 
-${COMMONDIR}/pseudolinkstubs.c: ${BASEDIR}/${PLATFORM}/librumprun_base.a
+PSEUDOSTUBS=${COMMONDIR}/rumprun-pseudolinkstubs
+
+${PSEUDOSTUBS}.c: ${BASEDIR}/${PLATFORM}/librumprun_base.a
        sh ../makepseudolinkstubs.sh ${NM} ${RUMPSRC} $< $@
 
 commonlibs: platformlibs userlibs
-userlibs: ${BASEDIR}/${PLATFORM}/librumprun_base.a ${COMMONDIR}/pseudolinkstubs.o
+userlibs: ${BASEDIR}/${PLATFORM}/librumprun_base.a ${PSEUDOSTUBS}.o
 platformlibs: ${COREDIR}/${PLATFORM}/libbmk_core.a ${RUMPUSERDIR}/${PLATFORM}/libbmk_rumpuser.a
 compiler_rt: ${COMPILERRTDIR}/${PLATFORM}/libcompiler_rt.a
 
@@ -53,7 +55,7 @@ commonclean:
        ( cd ${RUMPUSERDIR} && ${RUMPMAKE} MAKEOBJDIR=${PLATFORM} cleandir )
        ( cd ${COMPILERRTDIR} && \
                ${RUMPMAKE} RUMPSRC=${RUMPSRC} MAKEOBJDIR=${PLATFORM} cleandir )
-       rm -f ${COMMONDIR}/pseudolinkstubs.c ${COMMONDIR}/pseudolinkstubs.o
+       rm -f ${PSEUDOSTUBS}.c ${PSEUDOSTUBS}.o
 
 .PHONY: tests
 tests: ${MAINOBJ} commonlibs app-tools
@@ -69,3 +71,4 @@ endif
 .PHONY: install
 install: ${MAINOBJ}
        install -m 0666 ${MAINOBJ} ${INSTALLDIR}/lib
+       install -m 0666 ${PSEUDOSTUBS}.o ${INSTALLDIR}/lib