Module Name: src
Committed By: pooka
Date: Sun Apr 28 12:54:40 UTC 2013
Modified Files:
src: build.sh
src/sys/rump: Makefile.rump
Log Message:
fix "build.sh rumptest" wrt private hypercalls
To generate a diff of this commit:
cvs rdiff -u -r1.265 -r1.266 src/build.sh
cvs rdiff -u -r1.80 -r1.81 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.265 src/build.sh:1.266
--- src/build.sh:1.265 Thu Mar 7 04:51:58 2013
+++ src/build.sh Sun Apr 28 12:54:39 2013
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.265 2013/03/07 04:51:58 oki Exp $
+# $NetBSD: build.sh,v 1.266 2013/04/28 12:54:39 pooka Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1730,7 +1730,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.265 2013/03/07 04:51:58 oki Exp $
+# Generated from: \$NetBSD: build.sh,v 1.266 2013/04/28 12:54:39 pooka Exp $
# with these arguments: ${_args}
#
@@ -1958,6 +1958,7 @@ dorump()
[ "${1}" != "rumptest" ] && bomb 'build.sh rump not yet functional. ' \
'did you mean "rumptest"?'
+ export RUMPTEST_BUILDSH=1
# create obj and distrib dirs
if [ "${MKOBJDIRS}" != "no" ]; then
make_in_dir "${NETBSDSRCDIR}/etc/mtree" obj
@@ -1998,7 +1999,7 @@ dorump()
/undefined reference/ &&
!/more undefined references.*follow/{
if (match($NF,
- "`(rumpuser_|__" quirks ")") == 0)
+ "`(rumpuser_|rumpcomp_|__" quirks ")") == 0)
fails[NR] = $0
}
/cannot find -l/{fails[NR] = $0}
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.80 src/sys/rump/Makefile.rump:1.81
--- src/sys/rump/Makefile.rump:1.80 Sun Apr 28 10:25:04 2013
+++ src/sys/rump/Makefile.rump Sun Apr 28 12:54:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.80 2013/04/28 10:25:04 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.81 2013/04/28 12:54:39 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -87,7 +87,7 @@ DPSRCS+= ${RUMPTOP}/Makefile.rump
#
-.ifdef RUMPCOMP_USER
+.ifdef RUMPCOMP_USER && !defined(RUMPTEST_BUILDSH)
.if empty(DESTDIR)
DESTDIR=/
.endif
