Do not attempt to build libdisk, libthr and libc_r for arm.

This commit is contained in:
Olivier Houchard
2004-05-14 13:45:56 +00:00
parent c7730c31ca
commit cc5735a32d
+8 -3
View File
@@ -26,7 +26,7 @@ SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \
libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
${_libypclnt} ${_compat} libalias libarchive ${_libatm} ${_libbind} \ ${_libypclnt} ${_compat} libalias libarchive ${_libatm} ${_libbind} \
${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \
libipx libisc libkiconv libmenu ${_libmilter} ${_libmp} ${_libncp} \ libipx libisc libkiconv libmenu ${_libmilter} ${_libmp} ${_libncp} \
${_libngatm} libopie libpam libpanel libpcap \ ${_libngatm} libopie libpam libpanel libpcap \
@@ -43,7 +43,8 @@ _csu=csu
.endif .endif
# libc_r is obsolete on ia64. # libc_r is obsolete on ia64.
.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc" .if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc" && \
${MACHINE_ARCH} != "arm"
.if !defined(NOLIBC_R) .if !defined(NOLIBC_R)
_libc_r= libc_r _libc_r= libc_r
.endif .endif
@@ -96,12 +97,16 @@ _libpthread= libpthread
.endif .endif
.endif .endif
.if ${MACHINE_ARCH} != "amd64" .if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm"
.if !defined(NOLIBTHR) .if !defined(NOLIBTHR)
_libthr= libthr _libthr= libthr
.endif .endif
.endif .endif
.if ${MACHINE_ARCH} != "arm"
_libdisk= libdisk
.endif
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
_libmp= libmp _libmp= libmp
.endif .endif