diff options
| author | joerg <joerg@NetBSD.org> | 2012-08-23 15:45:02 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2012-08-23 15:45:02 +0000 |
| commit | 89cae5bb89a6fe1d7c57ef5d2e8f099150ee97b4 (patch) | |
| tree | 3cca1ee11f3f6935909bf1eb0a2dde41acbc8c53 /libexec | |
| parent | dfd19c41e064d1e39489639ffab018f13a2a262a (diff) | |
Remove SHLIBINSTALLDIR and SHLINKINSTALLLIBDIR. Add rpath entries, if
SHLIBDIR differs from /usr/lib.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ld.elf_so/Makefile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile index e858bd2f0cd..50f87237a12 100644 --- a/libexec/ld.elf_so/Makefile +++ b/libexec/ld.elf_so/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.112 2012/08/04 15:17:16 matt Exp $ +# $NetBSD: Makefile,v 1.113 2012/08/23 15:45:02 joerg Exp $ # # NOTE: when changing ld.so, ensure that ldd still compiles. # @@ -14,7 +14,6 @@ WARNS?=4 PIE_CFLAGS= PIE_LDFLAGS= .include <bsd.init.mk> # for MKPIC definition -.include <bsd.shlib.mk> # for SHLINKINSTALLDIR definition .if defined(LDELFSO_MACHINE_CPU) && !empty(LDELFSO_MACHINE_CPU) && \ exists(${.CURDIR}/arch/${LDELFSO_MACHINE_CPU}) @@ -81,8 +80,6 @@ xprintf.c: errlist_concat.h CLEANFILES+= errlist_concat.h -BINDIR= ${SHLINKINSTALLDIR} - CPPFLAGS+= -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\" CPPFLAGS+= -I${.CURDIR} -I. CPPFLAGS+= -DRTLD_LOADER @@ -98,11 +95,6 @@ COPTS= -O3 -fomit-frame-pointer COPTS+= -mno-3dnow -mno-mmx -mno-sse -mno-sse2 -mno-sse3 .endif - -.if ${SHLIBDIR} != ${LIBDIR} -CPPFLAGS+= -DRTLD_DEFAULT_LIBRARY_PATH=\"${SHLIBDIR}:${LIBDIR}\" -.endif - # rtld.c and symbol.c use alloca, so disable SSP warnings. COPTS.rtld.c+= -Wno-stack-protector COPTS.symbol.c+=-Wno-stack-protector @@ -133,8 +125,15 @@ ${PROG}: ${OBJS} ${DPADD} ${_MKMSG_LINK} ${PROG} ${CC} ${LDFLAGS} -o ${PROG} ${OBJS} ${LDADD} -.if ${SHLINKINSTALLDIR} != "/usr/libexec" -SYMLINKS+= ${SHLINKINSTALLDIR}/${PROG} /usr/libexec/${PROG} +.if ${MKDYNAMICROOT} == "no" +BINDIR= /usr/libexec +.else +BINDIR= /libexec +.endif +SHLINKDIR= ${BINDIR} + +.if ${SHLINKDIR} != "/usr/libexec" +SYMLINKS+= ${SHLINKDIR}/${PROG} /usr/libexec/${PROG} .endif .include <bsd.prog.mk> |
