svn commit: r282821 - in head: . lib
Ed Maste
emaste at FreeBSD.org
Tue May 12 17:53:23 UTC 2015
Author: emaste
Date: Tue May 12 17:53:22 2015
New Revision: 282821
URL: https://svnweb.freebsd.org/changeset/base/282821
Log:
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.
Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D2523
Modified:
head/Makefile.inc1
head/lib/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue May 12 16:55:50 2015 (r282820)
+++ head/Makefile.inc1 Tue May 12 17:53:22 2015 (r282821)
@@ -1660,13 +1660,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: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Tue May 12 16:55:50 2015 (r282820)
+++ head/lib/Makefile Tue May 12 17:53:22 2015 (r282821)
@@ -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_libulog= libmd
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"
More information about the svn-src-all
mailing list