From 051ed84f28e189e22d7a2a7c2b8d6870915362f8 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 12 Nov 2019 22:31:59 +0000
Subject: [PATCH] libcompat: Correct rtld MLINKS

Don't install duplicate ld-elf.so.1.1 and ld.so.1 links in rtld-elf32.
Do install lib-elf32.so.1.1 and ldd32.1 links.

Reported by:	madpilot
---
 libexec/rtld-elf/Makefile   | 2 +-
 libexec/rtld-elf32/Makefile | 1 +
 usr.bin/ldd32/Makefile      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 67ec1eb35cb0..d998a8694221 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -49,7 +49,7 @@ INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
 BINDIR=		/libexec
 SYMLINKS=	../..${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG}
-MLINKS=		rtld.1 ld-elf.so.1.1 \
+MLINKS?=	rtld.1 ld-elf.so.1.1 \
 		rtld.1 ld.so.1
 
 .if ${MACHINE_CPUARCH} == "sparc64"
diff --git a/libexec/rtld-elf32/Makefile b/libexec/rtld-elf32/Makefile
index 5b4c2e9c4007..4539ba6cf8c4 100644
--- a/libexec/rtld-elf32/Makefile
+++ b/libexec/rtld-elf32/Makefile
@@ -5,6 +5,7 @@ NEED_COMPAT=	32
 
 PROG=	ld-elf32.so.1
 MAN=
+MLINKS=	rtld.1 ld-elf32.so.1
 
 .PATH:  ${SRCTOP}/libexec/rtld-elf
 .include "${SRCTOP}/libexec/rtld-elf/Makefile"
diff --git a/usr.bin/ldd32/Makefile b/usr.bin/ldd32/Makefile
index 633947adeaa0..7ef2c8e15dac 100644
--- a/usr.bin/ldd32/Makefile
+++ b/usr.bin/ldd32/Makefile
@@ -5,6 +5,7 @@ NEED_COMPAT=	32
 
 PROG=	ldd32
 MAN=
+MLINKS=	ldd.1 ldd32.1
 
 .PATH:	${SRCTOP}/usr.bin/ldd
 .include "${SRCTOP}/usr.bin/ldd/Makefile"