diff --git a/Makefile.inc1 b/Makefile.inc1 index 790a1cd20494..6e58396fc535 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1149,7 +1149,7 @@ gnu/lib/libgcc__L: lib/libc__L _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ - lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \ + lib/libbz2 lib/libcom_err lib/libcrypt \ lib/libexpat lib/libfetch \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile index 57b161f74e17..605bde752723 100644 --- a/cddl/lib/drti/Makefile +++ b/cddl/lib/drti/Makefile @@ -8,7 +8,7 @@ FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESMODE= ${LIBMODE} FILESDIR= ${LIBDIR}/dtrace -CLEANFILES= ${FILES} ${FILES}.tmp +CLEANFILES= ${FILES} CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -18,10 +18,4 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -DPIC -fpic -.c.o: - ${CC} ${CFLAGS} -c ${.IMPSRC} - mv ${FILES} ${FILES}.tmp - ${LD} -o ${FILES} -r ${FILES}.tmp ${LIBELF_PIC} - rm -f ${FILES}.tmp - .include diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile index 4e51de0cc61b..fc70d9d865c7 100644 --- a/lib/libelf/Makefile +++ b/lib/libelf/Makefile @@ -55,7 +55,6 @@ SRCS= elf_begin.c \ ${GENSRCS} INCS= libelf.h gelf.h -INSTALL_PIC_ARCHIVE=yes GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c CLEANFILES= ${GENSRCS} CFLAGS+= -I. -I${.CURDIR}