D2523.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2523.id.diff
View Options

	Index: head/Makefile.inc1
	===================================================================
	--- head/Makefile.inc1
	+++ head/Makefile.inc1
	@@ -1660,13 +1660,7 @@
	# all shared libraries for ELF.
	#
	_startup_libs= gnu/lib/csu
	-.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
	-_startup_libs+= lib/csu/${MACHINE_ARCH}-elf
	-.elif exists(${.CURDIR}/lib/csu/${MACHINE_ARCH})
	-_startup_libs+= lib/csu/${MACHINE_ARCH}
	-.else
	-_startup_libs+= lib/csu/${MACHINE_CPUARCH}
	-.endif
	+_startup_libs+= lib/csu
	_startup_libs+= gnu/lib/libgcc
	_startup_libs+= lib/libcompiler_rt
	_startup_libs+= lib/libc
	Index: head/lib/Makefile
	===================================================================
	--- head/lib/Makefile
	+++ head/lib/Makefile
	@@ -8,7 +8,7 @@
	# and the main list to avoid needing a SUBDIR_DEPEND line on every library
	# naming just these few items.

	-SUBDIR_ORDERED= ${_csu} \
	+SUBDIR_ORDERED= csu \
	.WAIT \
	libc \
	libc_nonshared \
	@@ -156,16 +156,6 @@
	SUBDIR_DEPEND_libunbound= ${_libldns}
	SUBDIR_DEPEND_liblzma= ${_libthr}

	-.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
	-_csu=csu/${MACHINE_ARCH}-elf
	-.elif exists(${.CURDIR}/csu/${MACHINE_ARCH})
	-_csu=csu/${MACHINE_ARCH}
	-.elif exists(${.CURDIR}/csu/${MACHINE_CPUARCH}/Makefile)
	-_csu=csu/${MACHINE_CPUARCH}
	-.else
	-_csu=csu
	-.endif
	-
	# NB: keep these sorted by MK_* knobs

	.if ${MK_ATM} != "no"