summaryrefslogtreecommitdiff
path: root/external/bsd/libc++/include
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2014-08-09 19:06:49 +0000
committerjoerg <joerg@NetBSD.org>2014-08-09 19:06:49 +0000
commit4ee47088858c032e5c67e2e6b3daac657a20c5f0 (patch)
tree4ec452325d61f3dac53b710f9bd7e805a9ccd6e5 /external/bsd/libc++/include
parentaf1c82fbc87842521cd3012528634e60ff4caef6 (diff)
Update and simplify build glue for libc++ r215289.
Diffstat (limited to 'external/bsd/libc++/include')
-rw-r--r--external/bsd/libc++/include/Makefile29
1 files changed, 12 insertions, 17 deletions
diff --git a/external/bsd/libc++/include/Makefile b/external/bsd/libc++/include/Makefile
index 032fef4c772..df863a80c3c 100644
--- a/external/bsd/libc++/include/Makefile
+++ b/external/bsd/libc++/include/Makefile
@@ -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 .