Date: Tue, 26 May 2015 16:25:29 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r283572 - head Message-ID: <201505261625.t4QGPTot039810@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue May 26 16:25:28 2015 New Revision: 283572 URL: https://svnweb.freebsd.org/changeset/base/283572 Log: Fix build WITHOUT_CDDL by unconditionnaly adding libproc and librtld_db on supported arches to the prebuild libs Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue May 26 16:17:24 2015 (r283571) +++ head/Makefile.inc1 Tue May 26 16:25:28 2015 (r283572) @@ -1755,6 +1755,7 @@ _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 +.endif # 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" || \ @@ -1762,7 +1763,6 @@ cddl/lib/libctf__L: lib/libz__L ${MACHINE_CPUARCH} == "arm" _prebuild_libs+= lib/libproc lib/librtld_db .endif -.endif .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505261625.t4QGPTot039810>