From: robert <robert@openbsd.org>
Date: Tue, 11 Sep 2018 18:31:58 +0000 (+0000)
Subject: instead of defining _LIBCPP_DEBUG in debug.cpp which enables some debug
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=13317850d06b6ac5a2d670b8d0791ea05a1a42b0;p=openbsd

instead of defining _LIBCPP_DEBUG in debug.cpp which enables some debug
code which breaks quiet a few things, define _LIBCPP_BUILDING_LIBRARY
for the complete build to get the needed definitions in debug.cpp without
enabling debug code
---

diff --git a/lib/libcxx/Makefile b/lib/libcxx/Makefile
index f65f02304de..6543b3c7e11 100644
--- a/lib/libcxx/Makefile
+++ b/lib/libcxx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2018/09/11 18:29:53 robert Exp $
+# $OpenBSD: Makefile,v 1.8 2018/09/11 18:31:58 robert Exp $
 
 .include <bsd.own.mk>
 
@@ -51,7 +51,7 @@ SRCS+=		algorithm.cpp \
 		variant.cpp \
 		vector.cpp
 
-CPPFLAGS+=	-DLIBCXXABI -I${HDRDIR} \
+CPPFLAGS+=	-DLIBCXXABI -I${HDRDIR} -D_LIBCPP_BUILDING_LIBRARY \
 		-DLIBCXX_BUILDING_LIBCXXABI -I${AHDRDIR} -I${UHDRDIR}
 CXXFLAGS+=	-nostdlib -nostdinc++
 .if empty(CXXFLAGS:M-std=*)
diff --git a/lib/libcxx/src/debug.cpp b/lib/libcxx/src/debug.cpp
index c0739275d96..f2fc1ceb495 100644
--- a/lib/libcxx/src/debug.cpp
+++ b/lib/libcxx/src/debug.cpp
@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define _LIBCPP_DEBUG 1
 #include "__config"
 #include "__debug"
 #include "functional"