diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2021-10-13 12:40:26 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2021-11-06 15:03:06 +0000 |
| commit | b6b91760300b684d46ba84f8500b2dffe2e5e274 (patch) | |
| tree | 518f04656c7b89b98723a60aa069c92c4dade344 | |
| parent | e3f2519c5ca8acee483c5ae2b097e43cc3c81c39 (diff) | |
| download | src-b6b91760300b684d46ba84f8500b2dffe2e5e274.tar.gz src-b6b91760300b684d46ba84f8500b2dffe2e5e274.zip | |
rtld: Do not install libmap.conf when installing the COMPAT32 version
This has the effect of installing the same file twice at the same location
and confuse pkgbase as we add this file twice in the package config part.
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit d0f0e0bd741af867582ceede8ac1b0aec90eae2d)
| -rw-r--r-- | libexec/rtld-elf/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 9ae998942a12..b8354e1b6f2d 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -11,7 +11,9 @@ PACKAGE= clibs MK_PIE= no # Always position independent using local rules MK_SSP= no +.if !defined(NEED_COMPAT) CONFS= libmap.conf +.endif PROG?= ld-elf.so.1 .if (${PROG:M*ld-elf32*} != "") TAGS+= lib32 |