Date: Sat, 26 Nov 2011 03:26:07 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r227987 - in head: . lib share/mk Message-ID: <201111260326.pAQ3Q7Qw071782@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sat Nov 26 03:26:06 2011 New Revision: 227987 URL: http://svn.freebsd.org/changeset/base/227987 Log: 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 Modified: head/Makefile.inc1 head/lib/Makefile head/share/mk/bsd.own.mk Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Nov 26 01:44:37 2011 (r227986) +++ head/Makefile.inc1 Sat Nov 26 03:26:06 2011 (r227987) @@ -1218,7 +1218,7 @@ _startup_libs+= lib/csu/${MACHINE_CPUARC _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 Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Sat Nov 26 01:44:37 2011 (r227986) +++ head/lib/Makefile Sat Nov 26 03:26:06 2011 (r227987) @@ -48,13 +48,9 @@ SUBDIR_ORDERED= ${_csu} \ libsbuf \ libtacplus \ libutil \ - ${_libypclnt} - -.if ${MK_LIBCPLUSPLUS} != "no" -SUBDIR_ORDERED+=libcxxrt\ - libc++ -.endif - + ${_libypclnt} \ + ${_libcxxrt} \ + ${_libcplusplus} SUBDIR= ${SUBDIR_ORDERED} \ libalias \ @@ -209,6 +205,11 @@ _libsmb= libsmb _libmp= libmp .endif +.if ${MK_LIBCPLUSPLUS} != "no" +_libcxxrt= libcxxrt +_libcplusplus= libc++ +.endif + .if ${MK_PMC} != "no" _libpmc= libpmc .endif Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Sat Nov 26 01:44:37 2011 (r227986) +++ head/share/mk/bsd.own.mk Sat Nov 26 03:26:06 2011 (r227987) @@ -413,6 +413,7 @@ __DEFAULT_NO_OPTIONS = \ HESIOD \ ICONV \ IDEA \ + LIBCPLUSPLUS \ OFED # @@ -553,8 +554,6 @@ MK_GCC:= no MK_GDB:= no .endif -MK_LIBCPLUSPLUS?= no - # # Set defaults for the MK_*_SUPPORT variables. #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111260326.pAQ3Q7Qw071782>