Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/rump Fix the build w/o DESTDIR



details:   https://anonhg.NetBSD.org/src/rev/6e3139b60016
branches:  trunk
changeset: 785493:6e3139b60016
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Mar 16 21:38:21 2013 +0000

description:
Fix the build w/o DESTDIR

diffstat:

 sys/rump/Makefile.rump |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r ffdbe198b97d -r 6e3139b60016 sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Sat Mar 16 21:37:04 2013 +0000
+++ b/sys/rump/Makefile.rump    Sat Mar 16 21:38:21 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rump,v 1.74 2013/03/15 12:42:18 pooka Exp $
+#      $NetBSD: Makefile.rump,v 1.75 2013/03/16 21:38:21 christos Exp $
 #
 
 WARNS?=                3       # XXX: src/sys won't compile with -Wsign-compare yet
@@ -83,22 +83,27 @@
 # Support for component-specific hypercalls
 #
 
+
 .ifdef RUMPCOMP_USER
+.if empty(DESTDIR)
+DESTDIR=/
+.endif
+BUILDRUMP_CPPFLAGS ?= -isysroot ${DESTDIR}
 rumpcomp_user.d: rumpcomp_user.c
        ${_MKTARGET_CREATE}
-       ${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} ${BUILDRUMP_CPPFLAGS:U-isysroot ${DESTDIR}} ${RUMPCOMP_USER_CPPFLAGS} ${.CURDIR}/rumpcomp_user.c
+       ${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${.ALLSRC:M*.c}
 
 rumpcomp_user.o: rumpcomp_user.c
        ${_MKTARGET_COMPILE}
-       ${CC} -o ${.TARGET} ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS:U-isysroot ${DESTDIR}} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.CURDIR}/rumpcomp_user.c
+       ${CC} -o ${.TARGET} ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:M*.c}
 
 rumpcomp_user.pico: rumpcomp_user.c
        ${_MKTARGET_COMPILE}
-       ${CC} -o ${.TARGET} -fPIC -DPIC ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS:U-isysroot ${DESTDIR}} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c 
${.CURDIR}/rumpcomp_user.c
+       ${CC} -o ${.TARGET} -fPIC -DPIC ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:M*.c}
 
 rumpcomp_user.po: rumpcomp_user.c
        ${_MKTARGET_COMPILE}
-       ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS:U-isysroot ${DESTDIR}} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c 
${.CURDIR}/rumpcomp_user.c
+       ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:M*.c}
 
 RUMPCOMP_USEROBJ=rumpcomp_user.*o
 SRCS+=rumpcomp_user.c



Home | Main Index | Thread Index | Old Index