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.230 retrieving revision 1.233 diff -u -p -r1.230 -r1.233 --- src/share/mk/bsd.lib.mk 2003/08/01 17:04:01 1.230 +++ src/share/mk/bsd.lib.mk 2003/09/13 03:44:20 1.233 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.230 2003/08/01 17:04:01 lukem Exp $ +# $NetBSD: bsd.lib.mk,v 1.233 2003/09/13 03:44:20 erh Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include @@ -12,6 +12,14 @@ realinstall: checkver libinstall clean: cleanlib +##### LIB specific flags. +COPTS+= ${COPTS.lib${LIB}} +CPPFLAGS+= ${CPPFLAGS.lib${LIB}} +CXXFLAGS+= ${CXXFLAGS.lib${LIB}} +LDADD+= ${LDADD.lib${LIB}} +LDFLAGS+= ${LDFLAGS.lib${LIB}} +LDSTATIC+= ${LDSTATIC.lib${LIB}} + ##### Build and install rules CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include} CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++} @@ -383,13 +391,13 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL @rm -f lib${LIB}.so.${SHLIB_FULLVERSION} .if defined(DESTDIR) ${CC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \ - -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ + -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \ -Wl,--whole-archive ${SOLIB} \ -Wl,--no-whole-archive ${LDADD} \ -L${_GCC_LIBGCCDIR} -L${DESTDIR}${_LIBSODIR} -L${DESTDIR}${LIBDIR} \ -R${_LIBSODIR} -R${LIBDIR} .else - ${CC} -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ + ${CC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \ -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD} .endif .if ${OBJECT_FMT} == "ELF"