svn commit: r292339 - in stable/10: . lib

[Ed Maste]

Author: emaste
Date: Wed Dec 16 16:40:45 2015
New Revision: 292339
URL: https://svnweb.freebsd.org/changeset/base/292339

Log:
  MFC r282821: Remove redundant csu subdir logic
  
  The appropriate subdirectories are handled by lib/csu/Makefile. There's
  no need to duplicate this logic in Makefile.inc1 and lib/Makefile.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/Makefile.inc1
  stable/10/lib/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Wed Dec 16 16:19:18 2015	(r292338)
+++ stable/10/Makefile.inc1	Wed Dec 16 16:40:45 2015	(r292339)
@@ -1617,13 +1617,7 @@ _prereq_libs= gnu/lib/libssp/libssp_nons
 # 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

Modified: stable/10/lib/Makefile
==============================================================================
--- stable/10/lib/Makefile	Wed Dec 16 16:19:18 2015	(r292338)
+++ stable/10/lib/Makefile	Wed Dec 16 16:40:45 2015	(r292339)
@@ -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 \
@@ -142,16 +142,6 @@ SUBDIR_DEPEND_libtacplus= libmd
 SUBDIR_DEPEND_libulog= libmd
 SUBDIR_DEPEND_libunbound= ${_libldns}
 
-.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"