summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-12-17 11:13:55 -0200
committerRenato Botelho <renato@netgate.com>2015-12-17 11:13:55 -0200
commit02eb529700650bb0a6247479d6c83d206e0a5985 (patch)
treef2dd3e19d51cd578d33f2c231100e5248a937ad2 /lib
parent4e66c4599e6123e69ca54036271685a3dde9a929 (diff)
parent5952006acb1f0577732ac15f481976227292807f (diff)
downloadFreeBSD-src-02eb529700650bb0a6247479d6c83d206e0a5985.zip
FreeBSD-src-02eb529700650bb0a6247479d6c83d206e0a5985.tar.gz
Merge remote-tracking branch 'origin/stable/10' into devel
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