Module Name: src
Committed By: joerg
Date: Sat Aug 9 19:06:49 UTC 2014
Modified Files:
src/distrib/sets/lists/comp: mi
src/external/bsd/libc++/include: Makefile
Log Message:
Update and simplify build glue for libc++ r215289.
To generate a diff of this commit:
cvs rdiff -u -r1.1904 -r1.1905 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libc++/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1904 src/distrib/sets/lists/comp/mi:1.1905
--- src/distrib/sets/lists/comp/mi:1.1904 Fri Jul 25 21:43:13 2014
+++ src/distrib/sets/lists/comp/mi Sat Aug 9 19:06:49 2014
@@ -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
Index: src/external/bsd/libc++/include/Makefile
diff -u src/external/bsd/libc++/include/Makefile:1.5 src/external/bsd/libc++/include/Makefile:1.6
--- src/external/bsd/libc++/include/Makefile:1.5 Thu Nov 28 13:47:29 2013
+++ src/external/bsd/libc++/include/Makefile Sat Aug 9 19:06:49 2014
@@ -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 @@ INCS= __bit_reference \
cwchar \
cwctype \
deque \
- dynarray \
exception \
forward_list \
fstream \
@@ -77,7 +76,6 @@ INCS= __bit_reference \
mutex \
new \
numeric \
- optional \
ostream \
queue \
random \
@@ -103,21 +101,18 @@ INCS= __bit_reference \
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 .
