[src/trunk]: src Update and simplify build glue for libc++ r215289.

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

details:   https://anonhg.NetBSD.org/src/rev/9dd647608eb8
branches:  trunk
changeset: 798131:9dd647608eb8
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Aug 09 19:06:49 2014 +0000

description:
Update and simplify build glue for libc++ r215289.

diffstat:

 distrib/sets/lists/comp/mi           |   5 ++++-
 external/bsd/libc++/include/Makefile |  29 ++++++++++++-----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diffs (85 lines):

diff -r 67508ad454df -r 9dd647608eb8 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Sat Aug 09 19:03:43 2014 +0000
+++ b/distrib/sets/lists/comp/mi        Sat Aug 09 19:06:49 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.1904 2014/07/25 21:43:13 joerg Exp $
+#      $NetBSD: mi,v 1.1905 2014/08/09 19:06:49 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -263,8 +263,11 @@
 ./usr/include/c++/deque                                comp-cxx-include        libcxx
 ./usr/include/c++/dynarray                     comp-obsolete           obsolete
 ./usr/include/c++/exception                    comp-cxx-include        libcxx
+./usr/include/c++/experimental/__config                comp-cxx-include        libcxx
 ./usr/include/c++/experimental/dynarray                comp-cxx-include        libcxx
 ./usr/include/c++/experimental/optional                comp-cxx-include        libcxx
+./usr/include/c++/experimental/string_view     comp-cxx-include        libcxx
+./usr/include/c++/experimental/utility         comp-cxx-include        libcxx
 ./usr/include/c++/ext/__hash                   comp-cxx-include        libcxx
 ./usr/include/c++/ext/hash_map                 comp-cxx-include        libcxx
 ./usr/include/c++/ext/hash_set                 comp-cxx-include        libcxx
diff -r 67508ad454df -r 9dd647608eb8 external/bsd/libc++/include/Makefile
--- a/external/bsd/libc++/include/Makefile      Sat Aug 09 19:03:43 2014 +0000
+++ b/external/bsd/libc++/include/Makefile      Sat Aug 09 19:06:49 2014 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2013/11/28 13:47:29 joerg Exp $
+#      $NetBSD: Makefile,v 1.6 2014/08/09 19:06:49 joerg Exp $
 
 .include <bsd.init.mk>
 
 .PATH: ${LIBCXX_SRCDIR}/include
-.PATH: ${LIBCXX_SRCDIR}/include/experimental
-.PATH: ${LIBCXX_SRCDIR}/include/ext
+
+INCSDIR=       /usr/include/c++
 
 INCS=  __bit_reference \
        __config \
@@ -56,7 +56,6 @@
        cwchar \
        cwctype \
        deque \
-       dynarray \
        exception \
        forward_list \
        fstream \
@@ -77,7 +76,6 @@
        mutex \
        new \
        numeric \
-       optional \
        ostream \
        queue \
        random \
@@ -103,21 +101,18 @@
        unordered_set \
        utility \
        valarray \
-       vector \
-       __hash \
-       hash_map \
-       hash_set
+       vector
 
 INCS+=         cxxabi.h
 
-INCSDIR=       /usr/include/c++
-.for f in __hash hash_map hash_set
-INCSDIR_${f}=  /usr/include/c++/ext
-.endfor
-
-.for f in dynarray optional
-INCSDIR_${f}=  /usr/include/c++/experimental
-.endfor
+INCS+= ext/__hash \
+       ext/hash_map \
+       ext/hash_set
+INCS+= experimental/__config \
+       experimental/dynarray \
+       experimental/optional \
+       experimental/string_view \
+       experimental/utility
 
 cxxabi.h: ${LIBCXXRT_SRCDIR}/src/cxxabi.h
        cp ${LIBCXXRT_SRCDIR}/src/cxxabi.h .