diff options
author | ngie <ngie@FreeBSD.org> | 2015-05-20 13:05:33 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-05-20 13:05:33 +0000 |
commit | 93b1ff78ceba1b896dcf6d87b71846d9662bd945 (patch) | |
tree | 9e5b611ef82f4af8edaec305a92a8b65f24e6c8e | |
parent | 712fc38819473adc6c9438e6cba02e9e8cb7921b (diff) | |
download | FreeBSD-src-93b1ff78ceba1b896dcf6d87b71846d9662bd945.zip FreeBSD-src-93b1ff78ceba1b896dcf6d87b71846d9662bd945.tar.gz |
Unbreak the arm64/sparc64 tinderbox by only compiling lib/libproc and
lib/librtld_db on architectures where they're supported
Reported by: bz, Jenkins
Pointyhat to: bapt
-rw-r--r-- | Makefile.inc1 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 20c597c..11e83a9 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1694,8 +1694,6 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libopie lib/libpam ${_lib_libthr} \ ${_lib_libradius} lib/libsbuf lib/libtacplus \ lib/libgeom \ - lib/libproc \ - lib/librtld_db \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libuutil} \ ${_cddl_lib_libavl} \ @@ -1767,6 +1765,13 @@ _cddl_lib= cddl/lib cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L cddl/lib/libzfs__L: lib/libgeom__L cddl/lib/libctf__L: lib/libz__L +# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built +# on select architectures though (see cddl/lib/Makefile) +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ + ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \ + ${MACHINE_CPUARCH} == "arm" +_prebuild_libs+= lib/libproc lib/librtld_db +.endif .endif .if ${MK_CRYPT} != "no" |