From 054092c870537cabe49fb24c0bfe020c618af121 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Sun, 23 Jan 2005 15:36:42 +0000 Subject: [PATCH] Remove the support for lib/csu/${MACHINE_ARCH}-elf. This should also prevent some people from shooting themselves with partly cleaned sources. --- Makefile.inc1 | 6 +----- lib/Makefile | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 41f21e8fe3..d6555b312b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.54 2005/01/21 13:01:03 eirikn Exp $ +# $DragonFly: src/Makefile.inc1,v 1.55 2005/01/23 15:36:42 joerg Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -911,11 +911,7 @@ libraries: # _startup_libs2= gnu/lib/gcc2/libgcc _startup_libs34= gnu/lib/gcc34/libgcc -.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) -_startup_libs= lib/csu/${MACHINE_ARCH}-elf -.else _startup_libs= lib/csu/${MACHINE_ARCH} -.endif _startup_libs+= lib/csu/common lib/libc _prebuild_libs= lib/libarchive diff --git a/lib/Makefile b/lib/Makefile index 0af00dac04..7c7086f997 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/Makefile,v 1.107.2.16 2002/10/10 19:24:35 kbyanc Exp $ -# $DragonFly: src/lib/Makefile,v 1.13 2005/01/19 18:22:53 eirikn Exp $ +# $DragonFly: src/lib/Makefile,v 1.14 2005/01/23 15:36:42 joerg Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -30,11 +30,7 @@ SUBDIR= ${_csu} csu/common libarchive libcom_err libcrypt msun libmd \ ${_libsmutil} libstand libtelnet libusbhid ${_libvgl} libwrap \ libxpg4 liby libz -.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) -_csu=csu/${MACHINE_ARCH}-elf -.elif exists(${.CURDIR}/csu/${MACHINE_ARCH}) _csu=csu/${MACHINE_ARCH} -.endif .if ${MACHINE_ARCH} == "i386" .if !defined(NOLIBC_R) -- 2.41.0