[src/trunk]: src fix "build.sh rumptest" wrt private hypercalls

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/12f0b6a6ae72
branches:  trunk
changeset: 786435:12f0b6a6ae72
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Apr 28 12:54:39 2013 +0000

description:
fix "build.sh rumptest" wrt private hypercalls

diffstat:

 build.sh               |  7 ++++---
 sys/rump/Makefile.rump |  4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 91d0d7423d31 -r 12f0b6a6ae72 build.sh
--- a/build.sh  Sun Apr 28 12:51:04 2013 +0000
+++ b/build.sh  Sun Apr 28 12:54:39 2013 +0000
@@ -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 @@
        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 @@
        [ "${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 @@
                        /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}
diff -r 91d0d7423d31 -r 12f0b6a6ae72 sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Sun Apr 28 12:51:04 2013 +0000
+++ b/sys/rump/Makefile.rump    Sun Apr 28 12:54:39 2013 +0000
@@ -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 @@
 #
 
 
-.ifdef RUMPCOMP_USER
+.ifdef RUMPCOMP_USER && !defined(RUMPTEST_BUILDSH)
 .if empty(DESTDIR)
 DESTDIR=/
 .endif