Do not ``build'' (ie remove, and put in stub libraries) for libresolv

and/or libgnumalloc on anything but i386.  The other platforms
post-date this mistake.

Do not build libc_r for ia64.  There are some fundamental issues that
need to be resolved (ie: it cannot use setjmp/longjmp for thread
switching, which isn't likely to be fixed soon.  libc_r has to be
reimplemented using something like makecontext()/swapcontext() etc
in order to work in ia64.)

1 files changed, 8 insertions, 3 deletions

diff --git a/lib/Makefile b/lib/Makefile
index dc355196bd02..7a5172aa0114 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -24,10 +24,10 @@ SUBDIR=	${_csu} libcom_err libcrypt libkvm msun libmd \
 	libncurses libradius librpcsvc libtacplus libutil libsbuf \
 	${_compat} libalias libatm ${_libbind} libbz2 libc ${_libc_r} \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
-	libedit libfetch libform libftpio libgnumalloc ${_libio} libipsec \
+	libedit libfetch libform libftpio ${_libgnumalloc} ${_libio} libipsec \
 	libipx libisc libmenu ${_libmp} ${_libncp} \
 	libnetgraph libopie libpam libpanel libpcap \
-	libresolv libsmdb libsmutil \
+	${_libresolv} libsmdb libsmutil \
 	libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT})
@@ -38,7 +38,12 @@ _csu=csu/${MACHINE_ARCH}
 _csu=csu
 .endif
 
-.if !defined(NOLIBC_R)
+.if ${MACHINE_ARCH} == "i386"
+_libgnumalloc=	libgnumalloc
+_libresolv=	libresolv
+.endif
+
+.if !defined(NOLIBC_R) && ${MACHINE_ARCH} != ia64
 _libc_r=	libc_r
 .endif