diff options
author | emaste <emaste@FreeBSD.org> | 2015-05-12 17:53:22 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2015-05-12 17:53:22 +0000 |
commit | 2255b8cb4ef1a275074dbda845bd8904cdb6fed9 (patch) | |
tree | d7d6c3466996e1c1c83a134228a7c871894f66ed | |
parent | 7ce4eee72071905de1b261a8009c2fea01df2e36 (diff) | |
download | FreeBSD-src-2255b8cb4ef1a275074dbda845bd8904cdb6fed9.zip FreeBSD-src-2255b8cb4ef1a275074dbda845bd8904cdb6fed9.tar.gz |
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
-rw-r--r-- | Makefile.inc1 | 8 | ||||
-rw-r--r-- | lib/Makefile | 12 |
2 files changed, 2 insertions, 18 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 942fad3..3a19fb5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1660,13 +1660,7 @@ _prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc lib/libcompiler_rt # 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 diff --git a/lib/Makefile b/lib/Makefile index 349dfc2..d7d7f8a 100644 --- a/lib/Makefile +++ b/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_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" |