[src/trunk]: src/sys/rump Make include_headerlist ignore files in already exp...

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

details:   https://anonhg.NetBSD.org/src/rev/494b5e63d290
branches:  trunk
changeset: 454265:494b5e63d290
user:      bad <bad%NetBSD.org@localhost>
date:      Thu Sep 12 20:10:00 2019 +0000

description:
Make include_headerlist ignore files in already exported directories.
Invoke include_headerlist after exporting the ARCHS directories.

diffstat:

 sys/rump/listsrcdirs |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r c3175ac89339 -r 494b5e63d290 sys/rump/listsrcdirs
--- a/sys/rump/listsrcdirs      Thu Sep 12 18:43:02 2019 +0000
+++ b/sys/rump/listsrcdirs      Thu Sep 12 20:10:00 2019 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $NetBSD: listsrcdirs,v 1.42 2019/09/12 18:28:05 bad Exp $
+#      $NetBSD: listsrcdirs,v 1.43 2019/09/12 20:10:00 bad Exp $
 #
 
 #
@@ -73,7 +73,8 @@
                [ -f headerlist ] \
                        || { echo 'missing file: headerlist' 1>&2; exit 1; }
                sed -E -e '/^#/d' -e '/^[  ]*$/d' \
-                   -e "/^\.?\/?/s##src${pfx}#" headerlist
+                   -e "/^\.?\/?/s##src${pfx}#" headerlist \
+                   | egrep -v "^src${pfx}($(echo "$@" | tr ' ' \|))/include"
        fi
 }
 
@@ -140,15 +141,14 @@
            echo \!src/external/bsd/libc++/dist/libcxx/test \
                   src/external/bsd/libc++
 
-       # the includes mentioned in src/tools/headerlist are required.
-       # pull them in first or else CVS export will complain if they
-       # have been checked out as one of the usefule archs.
-       include_headerlist sys /sys/arch/
-
        # pick a few useful archs, namely those mentioned in buildrump.sh
        for arch in ${ARCHS}; do
                lsrc sys /sys/arch/${arch}/ include ${arch} Makefile
        done
+       # the includes mentioned in src/tools/headerlist are required.
+       # but pull in only those that have not been pulled in by the previous
+       # loop
+       include_headerlist sys /sys/arch/ ${ARCHS}
        for extra in ${ARCHS_EXTRA}; do
                lsrc sys /sys/arch/ ${extra}
        done