diff options
| author | brooks <brooks@FreeBSD.org> | 2013-05-07 22:05:57 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-05-07 22:05:57 +0000 |
| commit | dda6e068736ebb6565141c87715edf0526db5390 (patch) | |
| tree | 9ae5c5153bd81964ffd425ffeb1f71ed20b37305 /cddl/lib | |
| parent | b4216c2acc612269c751817555e7e57c958af030 (diff) | |
| download | FreeBSD-src-dda6e068736ebb6565141c87715edf0526db5390.zip FreeBSD-src-dda6e068736ebb6565141c87715edf0526db5390.tar.gz | |
Work around the implementation of LIBRARIES_ONLY. It causes drti.o to
not be installed in /usr/lib32 on systems with compat-32 support.
This fix has two parts. First, the build is forced by linking drti.o
into a dummy internal library. Second, the object file is installed
manually in the LIBRARIES_ONLY case.
MFC after: 3 days
Diffstat (limited to 'cddl/lib')
| -rw-r--r-- | cddl/lib/drti/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile index 6e3d3a6..c715809 100644 --- a/cddl/lib/drti/Makefile +++ b/cddl/lib/drti/Makefile @@ -9,6 +9,8 @@ FILESGRP= ${LIBGRP} FILESMODE= ${LIBMODE} FILESDIR= ${LIBDIR}/dtrace CLEANFILES= ${FILES} +LIB= drti-dummy +INTERNALLIB= CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -18,4 +20,10 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -DPIC ${PICFLAG} +.if make(install) && defined(LIBRARIES_ONLY) +install: + ${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \ + ${FILES} ${DESTDIR}${FILESDIR} +.endif + .include <bsd.lib.mk> |
