From 49c8e5e77e93307af187f91a0c452b2f5d1ca53f Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 26 Nov 2011 03:26:06 +0000 Subject: Fix breakage after r227983; lib/libcxxrt still got built, because it was not disabled in the usual way (by adding it to __DEFAULT_NO_OPTIONS in share/mk/bsd.own.mk), and because the test for MK_LIBCPLUSPLUS in Makefile.inc1 was incorrect. Pointy hat to: dim --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.inc1') diff --git a/Makefile.inc1 b/Makefile.inc1 index 5c9cafa6f50d..c9534197a0f4 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1218,7 +1218,7 @@ _startup_libs+= lib/csu/${MACHINE_CPUARCH} _startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libcompiler_rt _startup_libs+= lib/libc -.if defined(MK_LIBCPLUSPLUS) +.if ${MK_LIBCPLUSPLUS} != "no" _startup_libs+= lib/libcxxrt .endif -- cgit v1.2.3