Attachment 120651 Details for Bug 163469 – libcplusplus.patch.txt

libcplusplus.patch.txt

libcplusplus.patch.txt (text/plain), 1.31 KB, created by yamayan on 2011-12-25 05:12:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: yamayan

Created: 2011-12-25 05:12:57 UTC

Size: 1.31 KB

patch

obsolete

>Index: Makefile.inc1
>===================================================================
>--- Makefile.inc1	(revision 228856)
>+++ Makefile.inc1	(working copy)
>@@ -1190,7 +1190,12 @@
> libraries:
> 	cd ${.CURDIR}; \
> 	    ${MAKE} -f Makefile.inc1 _prereq_libs; \
>-	    ${MAKE} -f Makefile.inc1 _startup_libs; \
>+	    ${MAKE} -f Makefile.inc1 _startup_libs;
>+.if ${MK_LIBCPLUSPLUS} != "no"
>+	cd ${.CURDIR}; \
>+	    ${MAKE} -f Makefile.inc1 lib/libcxxrt;
>+.endif
>+	cd ${.CURDIR}; \
> 	    ${MAKE} -f Makefile.inc1 _prebuild_libs; \
> 	    ${MAKE} -f Makefile.inc1 _generic_libs;
> 
>@@ -1215,9 +1220,6 @@
> _startup_libs+=	gnu/lib/libgcc
> _startup_libs+=	lib/libcompiler_rt
> _startup_libs+=	lib/libc
>-.if ${MK_LIBCPLUSPLUS} != "no"
>-_startup_libs+=	lib/libcxxrt
>-.endif
> 
> gnu/lib/libgcc__L: lib/libc__L
> 
>@@ -1323,7 +1325,7 @@
> .endif
> .endfor
> 
>-.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
>+.for _lib in ${_startup_libs} lib/libcxxrt ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
> ${_lib}__L: .PHONY
> .if exists(${.CURDIR}/${_lib})
> 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
>@@ -1348,6 +1350,7 @@
> 
> _prereq_libs: ${_prereq_libs:S/$/__PL/}
> _startup_libs: ${_startup_libs:S/$/__L/}
>+lib/libcxxrt: lib/libcxxrt__L
> _prebuild_libs: ${_prebuild_libs:S/$/__L/}
> _generic_libs: ${_generic_libs:S/$/__L/}
>

Actions: View

Attachments on bug 163469: 120651