diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-07-05 21:29:52 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-07-05 21:29:52 +0000 |
| commit | 1a2a6a7db7b9fe8a0cbab3485a330fdf4f35559e (patch) | |
| tree | e609ea01858edbfe16a611838276446148fd418e /libexec | |
| parent | e02df503da80168b71a858e6a8c7131e586e322a (diff) | |
ELF_TOOLCHAIN bye bye.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ld.so/Makefile | 6 | ||||
| -rw-r--r-- | libexec/ld.so/ldconfig/Makefile | 6 | ||||
| -rw-r--r-- | libexec/ld.so/ldd/Makefile | 5 |
3 files changed, 3 insertions, 14 deletions
diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile index f1b3ab1433f..ae716f48ac4 100644 --- a/libexec/ld.so/Makefile +++ b/libexec/ld.so/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.44 2013/06/01 09:57:55 miod Exp $ +# $OpenBSD: Makefile,v 1.45 2013/07/05 21:29:51 miod Exp $ SUBDIR=ldconfig ldd MAN= ld.so.1 .include <bsd.own.mk> -.if (${ELF_TOOLCHAIN:L} == "yes") - .if defined(NOPIC) NOPROG= .else @@ -40,6 +38,4 @@ $(PROG): $(LD) -x -e _dl_start $(ELF_LDFLAGS) -o $(PROG) $(OBJS) $(LDADD) .endif -.endif - .include <bsd.prog.mk> diff --git a/libexec/ld.so/ldconfig/Makefile b/libexec/ld.so/ldconfig/Makefile index 8f46c1d5d1e..4cd40feb2b5 100644 --- a/libexec/ld.so/ldconfig/Makefile +++ b/libexec/ld.so/ldconfig/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.9 2013/03/20 21:49:59 kurt Exp $ +# $OpenBSD: Makefile,v 1.10 2013/07/05 21:29:51 miod Exp $ # $NetBSD: Makefile,v 1.10 1995/03/06 04:24:41 cgd Exp $ MAN= ldconfig.8 .include <bsd.own.mk> -.if (${ELF_TOOLCHAIN:L} == "yes") - PROG= ldconfig SRCS= ldconfig.c shlib.c etc.c prebind_delete.c debug.c prebind.c library.c sod.c prebind_path.c LDDIR?= $(.CURDIR)/.. @@ -17,6 +15,4 @@ BINDIR= /sbin #.PATH: $(LDDIR) $(LDDIR)/$(MACHINE_ARCH) -.endif - .include <bsd.prog.mk> diff --git a/libexec/ld.so/ldd/Makefile b/libexec/ld.so/ldd/Makefile index 8baefbddbb5..4bb2248102f 100644 --- a/libexec/ld.so/ldd/Makefile +++ b/libexec/ld.so/ldd/Makefile @@ -1,16 +1,13 @@ -# $OpenBSD: Makefile,v 1.4 2013/02/17 22:06:31 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2013/07/05 21:29:51 miod Exp $ MAN= ldd.1 .include <bsd.own.mk> -.if (${ELF_TOOLCHAIN:L} == "yes") PROG= ldd SRCS= ldd.c #CFLAGS+=-Werror BINDIR= /usr/bin -.endif - .include <bsd.prog.mk> |