summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2015-12-16 16:40:45 +0000
committeremaste <emaste@FreeBSD.org>2015-12-16 16:40:45 +0000
commitfa6577ca641a1bdfdbfcf570b90dbad48204222c (patch)
tree59e0b2a47b63d855cd12c90b1c1bdf679b36f481 /lib
parent2553d019b444ee551f86408b641625151410c50b (diff)
downloadFreeBSD-src-fa6577ca641a1bdfdbfcf570b90dbad48204222c.zip
FreeBSD-src-fa6577ca641a1bdfdbfcf570b90dbad48204222c.tar.gz
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
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile12
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 572d374..72d3633 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 \
@@ -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"
OpenPOWER on IntegriCloud