Use DESTDIR to point at libraries like bsd.prog.mk does (PR#2524).
This commit is contained in:
parent
88b833a7cd
commit
721a11bff8
|
@ -1,15 +1,16 @@
|
||||||
# $NetBSD: Makefile,v 1.12 1996/01/02 08:54:28 thorpej Exp $
|
# $NetBSD: Makefile,v 1.13 1996/06/08 22:22:26 pk Exp $
|
||||||
|
|
||||||
PROG= ld.so
|
PROG= ld.so
|
||||||
SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c vfprintf.c
|
SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c vfprintf.c
|
||||||
#NOMAN= noman
|
|
||||||
MAN= rtld.1
|
MAN= rtld.1
|
||||||
LDDIR?= $(.CURDIR)/..
|
LDDIR?= $(.CURDIR)/..
|
||||||
#PICFLAG=-pic
|
|
||||||
PICFLAG=-fpic -fno-function-cse
|
PICFLAG=-fpic -fno-function-cse
|
||||||
CFLAGS+=-I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE_ARCH) $(PICFLAG) -DRTLD -DLIBC_SCCS
|
CFLAGS+=-I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE_ARCH) $(PICFLAG) -DRTLD -DLIBC_SCCS
|
||||||
LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic
|
|
||||||
ASFLAGS+=-k
|
ASFLAGS+=-k
|
||||||
|
LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic
|
||||||
|
.if defined(DESTDIR)
|
||||||
|
LDFLAGS+= -nostdlib -L${DESTDIR}/usr/lib
|
||||||
|
.endif
|
||||||
LDADD+= -lc_pic
|
LDADD+= -lc_pic
|
||||||
BINDIR= /usr/libexec
|
BINDIR= /usr/libexec
|
||||||
MLINKS= rtld.1 ld.so.1
|
MLINKS= rtld.1 ld.so.1
|
||||||
|
|
|
@ -1,15 +1,16 @@
|
||||||
# $NetBSD: Makefile,v 1.12 1996/01/02 08:54:28 thorpej Exp $
|
# $NetBSD: Makefile,v 1.13 1996/06/08 22:22:26 pk Exp $
|
||||||
|
|
||||||
PROG= ld.so
|
PROG= ld.so
|
||||||
SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c vfprintf.c
|
SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c vfprintf.c
|
||||||
#NOMAN= noman
|
|
||||||
MAN= rtld.1
|
MAN= rtld.1
|
||||||
LDDIR?= $(.CURDIR)/..
|
LDDIR?= $(.CURDIR)/..
|
||||||
#PICFLAG=-pic
|
|
||||||
PICFLAG=-fpic -fno-function-cse
|
PICFLAG=-fpic -fno-function-cse
|
||||||
CFLAGS+=-I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE_ARCH) $(PICFLAG) -DRTLD -DLIBC_SCCS
|
CFLAGS+=-I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE_ARCH) $(PICFLAG) -DRTLD -DLIBC_SCCS
|
||||||
LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic
|
|
||||||
ASFLAGS+=-k
|
ASFLAGS+=-k
|
||||||
|
LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic
|
||||||
|
.if defined(DESTDIR)
|
||||||
|
LDFLAGS+= -nostdlib -L${DESTDIR}/usr/lib
|
||||||
|
.endif
|
||||||
LDADD+= -lc_pic
|
LDADD+= -lc_pic
|
||||||
BINDIR= /usr/libexec
|
BINDIR= /usr/libexec
|
||||||
MLINKS= rtld.1 ld.so.1
|
MLINKS= rtld.1 ld.so.1
|
||||||
|
|
Loading…
Reference in New Issue