From bdc986df08ec5268035412d220883cde27250a60 Mon Sep 17 00:00:00 2001 From: reed Date: Fri, 18 Nov 2005 06:31:22 +0000 Subject: Do not define LIBC and other LIB* settings. This should fix problem with building on systems that don't have the /usr/lib/libc.a (LIBC). This is the log entry from mk-files 20051104: * prog.mk: remove all the LIBC?= junk, use .-include libnames.mk instead (none by default). Note this is not an exact copy of the mk-files 20051104 prog.mk. (Todo: compare and test all the mk files with sjg's version.) --- bootstrap/bmake/mk/bsd.prog.mk | 56 +++--------------------------------------- 1 file changed, 3 insertions(+), 53 deletions(-) (limited to 'bootstrap') diff --git a/bootstrap/bmake/mk/bsd.prog.mk b/bootstrap/bmake/mk/bsd.prog.mk index 962d4ea86d0..b29cfeb5be6 100644 --- a/bootstrap/bmake/mk/bsd.prog.mk +++ b/bootstrap/bmake/mk/bsd.prog.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.1.1.1 2004/03/11 13:04:17 grant Exp $ +# $NetBSD: bsd.prog.mk,v 1.2 2005/11/18 06:31:22 reed Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .if !target(__initialized__) @@ -27,58 +27,8 @@ LIBCRTBEGIN?= LIBCRTEND?= .endif -LIBBZ2?= ${DESTDIR}/usr/lib/libbz2.a -LIBC?= ${DESTDIR}/usr/lib/libc.a -LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a -LIBCDK?= ${DESTDIR}/usr/lib/libcdk.a -LIBCOM_ERR?= ${DESTDIR}/usr/lib/libcom_err.a -LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a -LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a -LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a -LIBCRYPTO_RC5?= ${DESTDIR}/usr/lib/libcrypto_rc5.a -LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.a -LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a -LIBDBM?= ${DESTDIR}/usr/lib/libdbm.a -LIBDES?= ${DESTDIR}/usr/lib/libdes.a -LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a -LIBFORM?= ${DESTDIR}/usr/lib/libform.a -LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a -LIBGNUMALLOC?= ${DESTDIR}/usr/lib/libgnumalloc.a -LIBGSSAPI?= ${DESTDIR}/usr/lib/libgssapi.a -LIBHDB?= ${DESTDIR}/usr/lib/libhdb.a -LIBINTL?= ${DESTDIR}/usr/lib/libintl.a -LIBIPSEC?= ${DESTDIR}/usr/lib/libipsec.a -LIBKADM?= ${DESTDIR}/usr/lib/libkadm.a -LIBKADM5CLNT?= ${DESTDIR}/usr/lib/libkadm5clnt.a -LIBKADM5SRV?= ${DESTDIR}/usr/lib/libkadm5srv.a -LIBKAFS?= ${DESTDIR}/usr/lib/libkafs.a -LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a -LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a -LIBKRB5?= ${DESTDIR}/usr/lib/libkrb5.a -LIBKSTREAM?= ${DESTDIR}/usr/lib/libkstream.a -LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a -LIBL?= ${DESTDIR}/usr/lib/libl.a -LIBM?= ${DESTDIR}/usr/lib/libm.a -LIBMENU?= ${DESTDIR}/usr/lib/libmenu.a -LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a -LIBOSSAUDIO?= ${DESTDIR}/usr/lib/libossaudio.a -LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a -LIBPOSIX?= ${DESTDIR}/usr/lib/libposix.a -LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a -LIBRMT?= ${DESTDIR}/usr/lib/librmt.a -LIBROKEN?= ${DESTDIR}/usr/lib/libroken.a -LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a -LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a -LIBSS?= ${DESTDIR}/usr/lib/libss.a -LIBSSL?= ${DESTDIR}/usr/lib/libssl.a -LIBSL?= ${DESTDIR}/usr/lib/libsl.a -LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a -LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.a -LIBUSB?= ${DESTDIR}/usr/lib/libusb.a -LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a -LIBWRAP?= ${DESTDIR}/usr/lib/libwrap.a -LIBY?= ${DESTDIR}/usr/lib/liby.a -LIBZ?= ${DESTDIR}/usr/lib/libz.a +# here is where you can define what LIB* are +.-include .if defined(SHAREDSTRINGS) CLEANFILES+=strings -- cgit v1.2.3