Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.212 retrieving revision 1.217 diff -u -p -r1.212 -r1.217 --- src/share/mk/bsd.lib.mk 2002/11/22 06:44:56 1.212 +++ src/share/mk/bsd.lib.mk 2003/05/26 12:38:59 1.217 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.212 2002/11/22 06:44:56 thorpej Exp $ +# $NetBSD: bsd.lib.mk,v 1.217 2003/05/26 12:38:59 wiz Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include @@ -103,17 +103,6 @@ CPPPICFLAGS?= -DPIC CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} APICFLAGS ?= -.elif ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" - -# On MIPS, all libs are compiled with ABIcalls (and are thus PIC), -# not just sharedlibs. -MKPICLIB= no - -.elif ${MACHINE_ARCH} == "vax" && ${OBJECT_FMT} == "ELF" - -# On the VAX, all object are PIC by default, not just sharedlibs. -MKPICLIB= no - .elif (${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") && \ ${OBJECT_FMT} == "ELF" @@ -149,8 +138,6 @@ APICFLAGS?= -k .endif -MKPICLIB?= yes - .if ${MKPICLIB} != "no" CSHLIBFLAGS+= ${CPICFLAGS} .endif @@ -166,8 +153,14 @@ MKSHLIBOBJS= no SHLIB_SOVERSION= ${SHLIB_MAJOR} SHLIB_SHFLAGS= -soname lib${LIB}.so.${SHLIB_SOVERSION} SHLIB_LDSTARTFILE?= ${DESTDIR}/usr/lib/crti.o ${DESTDIR}/usr/lib/crtbeginS.o +# Some platforms require additional endfile support. +.if ${MACHINE_ARCH} == "powerpc" && defined(HAVE_GCC3) +SHLIB_LDENDFILE?= ${DESTDIR}/usr/lib/crtsavres.o \ + ${DESTDIR}/usr/lib/crtendS.o ${DESTDIR}/usr/lib/crtn.o +.else SHLIB_LDENDFILE?= ${DESTDIR}/usr/lib/crtendS.o ${DESTDIR}/usr/lib/crtn.o .endif +.endif CFLAGS+= ${COPTS} FFLAGS+= ${FOPTS} @@ -266,7 +259,7 @@ FFLAGS+= ${FOPTS} .endif .f.ln: - ${ECHO} Skipping lint for Fortran libraries. + @echo Skipping lint for Fortran libraries. .m.o: .if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*) @@ -316,6 +309,7 @@ FFLAGS+= ${FOPTS} @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o +.if defined(LIB) .if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \ || ${MKLINKLIB} != "no" _LIBS=lib${LIB}.a @@ -365,6 +359,10 @@ ALLOBJS=${POBJS} ${SOBJS} .if ${MKLINT} != "no" && ${MKLINKLIB} != "no" && !empty(LOBJS) ALLOBJS+=${LOBJS} .endif +.else +LOBJS= +SOBJS= +.endif .NOPATH: ${ALLOBJS} ${_LIBS} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}