svn commit: r227987 - in head: . lib share/mk
Bjoern A. Zeeb
bz at FreeBSD.org
Sat Nov 26 19:01:08 UTC 2011
On Sat, 26 Nov 2011, Dimitry Andric wrote:
> 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
Can you please also add an tools/build/options/ entry and re-gen
src.conf(5)?
> 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.
> #
>
--
Bjoern A. Zeeb You have to have visions!
Stop bit received. Insert coin for new address family.
More information about the svn-src-head
mailing list