summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2016-09-19 11:23:17 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2016-09-19 11:23:17 +0000
commit8cc7dce17fc51404a2c569cedac9efe25ada7dfe (patch)
tree98cbb285ab1ed422bcfb11383bed12f0944f6a53
parent2e7ec16101710102310c8082b1a0f20c20e0a0fc (diff)
Add -nostdinc++ like the original CMakeLists.txt does. Fixes bulding with
clang++. ok pascal@, patrick@
-rw-r--r--lib/libcxx/Makefile4
-rw-r--r--lib/libcxxabi/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libcxx/Makefile b/lib/libcxx/Makefile
index f27bb76607d..1c2070187f5 100644
--- a/lib/libcxx/Makefile
+++ b/lib/libcxx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2016/09/04 12:48:33 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2016/09/19 11:22:39 kettenis Exp $
HDRDIR= ${.CURDIR}/include
SRCDIR= ${.CURDIR}/src
@@ -41,7 +41,7 @@ SRCS+= algorithm.cpp\
CPPFLAGS+= -DLIBCXXABI -I${HDRDIR} \
-DLIBCXX_BUILDING_LIBCXXABI -I${AHDRDIR} -I${UHDRDIR}
-CXXFLAGS+= -nostdlib
+CXXFLAGS+= -nostdlib -nostdinc++
.if empty(CXXFLAGS:M-std=*)
CXXFLAGS+= -std=c++11
.endif
diff --git a/lib/libcxxabi/Makefile b/lib/libcxxabi/Makefile
index cff5841be9e..a64737ec00e 100644
--- a/lib/libcxxabi/Makefile
+++ b/lib/libcxxabi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2016/09/04 12:48:34 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2016/09/19 11:23:16 kettenis Exp $
HDRDIR= ${.CURDIR}/include
SRCDIR= ${.CURDIR}/src
@@ -39,7 +39,7 @@ SRCS+= abort_message.cpp\
libunwind.cpp
CPPFLAGS+= -I${SHDRDIR} -I${HDRDIR} -I${UHDRDIR}
-CXXFLAGS+= -nostdlib -funwind-tables
+CXXFLAGS+= -nostdlib -nostdinc++ -funwind-tables
.if empty(CXXFLAGS:M-std=*)
CXXFLAGS+= -std=c++11
.endif