From: Antti Kantee <pooka@iki.fi>
Date: Thu, 15 Oct 2015 17:52:45 +0000 (+0000)
Subject: Build librumprun_base as part of userland build-rr.sh cycle
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3404357ba144ed3109a011a57c948681d7636818;p=osstest%2Frumprun.git

Build librumprun_base as part of userland build-rr.sh cycle

Also, install the lib to destdir.
---

diff --git a/build-rr.sh b/build-rr.sh
index bdf8da8..4a6190e 100755
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -325,6 +325,7 @@ builduserspace ()
 	for lib in ${LIBS}; do
 		makeuserlib ${lib}
 	done
+	makeuserlib $(pwd)/lib/librumprun_base ${PLATFORM}
 	makeuserlib $(pwd)/lib/librumprun_tester ${PLATFORM}
 
 	# build unwind bits if we support c++
@@ -341,9 +342,6 @@ builduserspace ()
 buildpci ()
 {
 
-	# need links to build the hypercall module
-	${MAKE} -C ${PLATFORMDIR} links
-
 	if eval ${PLATFORM_PCI_P}; then
 		${RUMPMAKE} -f ${PLATFORMDIR}/pci/Makefile.pci ${STDJ} obj
 		${RUMPMAKE} -f ${PLATFORMDIR}/pci/Makefile.pci ${STDJ} dependall
@@ -413,6 +411,8 @@ dobuild ()
 	PLATFORM_MKCONF=
 	. ${PLATFORMDIR}/platform.conf
 
+	${MAKE} -C ${PLATFORMDIR} links
+
 	buildrump "$@"
 	${KERNONLY} || builduserspace
 
diff --git a/lib/librumprun_base/Makefile b/lib/librumprun_base/Makefile
index 6cd28ce..bcabff7 100644
--- a/lib/librumprun_base/Makefile
+++ b/lib/librumprun_base/Makefile
@@ -1,5 +1,4 @@
 LIB=		rumprun_base
-LIBISPRIVATE=	# defined
 
 SRCS=		main.c rumprun.c
 SRCS+=		parseargs.c rumpconfig.c
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 63fad23..45bfd3d 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -4,13 +4,10 @@ endif
 
 COREDIR:=	$(shell pwd)/../../lib/libbmk_core
 RUMPUSERDIR:=	$(shell pwd)/../../lib/libbmk_rumpuser
-BASEDIR:=	$(shell pwd)/../../lib/librumprun_base
 COMPILERRTDIR:=	$(shell pwd)/../../lib/libcompiler_rt
 
 COMMONDIR:=	$(abspath ../)
 
-LDFLAGS_BAKE+=	-L${BASEDIR}/${PLATFORM}
-
 define BUILDLIB_target
 .PHONY: ${1}/${PLATFORM}/${2}
 ${1}/${PLATFORM}/${2}:
@@ -19,21 +16,20 @@ ${1}/${PLATFORM}/${2}:
 	    && ${RUMPMAKE} MAKEOBJDIR=${PLATFORM} ${3} dependall )
 endef
 
-$(eval $(call BUILDLIB_target,${BASEDIR},librumprun_base.a))
 $(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}))
 
 PSEUDOSTUBS=${COMMONDIR}/rumprun-pseudolinkstubs
 
-${PSEUDOSTUBS}.c: ${BASEDIR}/${PLATFORM}/librumprun_base.a
+${PSEUDOSTUBS}.c: ${OBJDIR}/dest.stage/lib/librumprun_base.a
 	sh ../makepseudolinkstubs.sh ${NM} ${RUMPSRC} $< $@
 
 bmk.ldscript: ${LDSCRIPT}
 	ln -sf $< $@
 
 commonlibs: platformlibs userlibs
-userlibs: ${BASEDIR}/${PLATFORM}/librumprun_base.a ${PSEUDOSTUBS}.o
+userlibs: ${PSEUDOSTUBS}.o
 platformlibs: ${COREDIR}/${PLATFORM}/libbmk_core.a ${RUMPUSERDIR}/${PLATFORM}/libbmk_rumpuser.a bmk.ldscript
 compiler_rt: ${COMPILERRTDIR}/${PLATFORM}/libcompiler_rt.a
 
@@ -53,7 +49,6 @@ buildtest: ../../tests/hello/hello.c ${MAINOBJ} commonlibs app-tools
 
 .PHONY: commonclean
 commonclean:
-	( cd ${BASEDIR} && ${RUMPMAKE} MAKEOBJDIR=${PLATFORM} cleandir )
 	( cd ${COREDIR} && ${RUMPMAKE} MAKEOBJDIR=${PLATFORM} cleandir )
 	( cd ${RUMPUSERDIR} && ${RUMPMAKE} MAKEOBJDIR=${PLATFORM} cleandir )
 	( cd ${COMPILERRTDIR} && \