From c78937e224ee6145f9ec1a84042b29999dee64a8 Mon Sep 17 00:00:00 2001 From: imp Date: Sat, 14 Jun 2003 17:50:13 +0000 Subject: Minor tweaks to the build process so that we can build 5.1-current on 4.8-stable: Must build lib/libc before libpthread. Fix how we do this to be more consistant with how lists are handled in the file. Also, don't bother to prebuild libc if we're not building libpthread. Submitted by: ru@ Reviewed by: bde@ (before ru@ submitted it) --- Makefile.inc1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Makefile.inc1') diff --git a/Makefile.inc1 b/Makefile.inc1 index b9b530f..acdc0ac 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -774,6 +774,8 @@ libraries: # gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all # shared libraries for ELF. # +# lib/libc (libc_pic.a) must be built before lib/libpthread. +# _startup_libs= gnu/lib/csu gnu/lib/libgcc .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) _startup_libs+= lib/csu/${MACHINE_ARCH}-elf @@ -781,7 +783,7 @@ _startup_libs+= lib/csu/${MACHINE_ARCH}-elf _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs+= lib/libc +_prebuild_libs= _generic_libs= gnu/lib .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ @@ -793,6 +795,9 @@ _prebuild_libs+= kerberos5/lib/libroken _generic_libs+= kerberos5/lib .endif +.if !defined(NOLIBPTHREAD) +_prebuild_libs+= lib/libc +.endif _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \ lib/libkvm lib/libmd \ lib/libncurses lib/libopie lib/libpam lib/libradius \ -- cgit v1.1