From e77c6f6a95cef678764898a4a6380d466fd900d1 Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Fri, 10 Nov 2017 20:03:37 +0200
Subject: [PATCH] buildworld: Mark few special PROG cases.

When NOSHARED is set it leads to undesirable link commands having both -shared
and -static arguments. Avoid that.
---
 libexec/rtld-elf/Makefile    | 3 +++
 sys/boot/efi/boot1/Makefile  | 3 +++
 sys/boot/efi/loader/Makefile | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index db90168f6f..19f1111779 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -9,6 +9,9 @@ BINDIR=		/libexec
 SYMLINKS=	${BINDIR}/${PROG} /usr/libexec/${PROG}
 WARNS?=		2
 
+# DO NOT USE -static, this is a special case
+.undef NOSHARED
+
 # To activate LD_DEBUG functionality, define ENABLE_DEBUG
 # e.g. make -DENABLE_DEBUG
 
diff --git a/sys/boot/efi/boot1/Makefile b/sys/boot/efi/boot1/Makefile
index 1ca65e8f12..a83cc3ec63 100644
--- a/sys/boot/efi/boot1/Makefile
+++ b/sys/boot/efi/boot1/Makefile
@@ -9,6 +9,9 @@ WARNS?=		6
 # architecture-specific loader code
 SRCS=	boot1.c self_reloc.c start.S ufs_module.c
 
+# DO NOT USE -static, this is a special case
+.undef NOSHARED
+
 CFLAGS+=	-I.
 CFLAGS+=	-I${.CURDIR}/../include
 CFLAGS+=	-I${.CURDIR}/../include/${MACHINE}
diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile
index 0029420823..668babcb7b 100644
--- a/sys/boot/efi/loader/Makefile
+++ b/sys/boot/efi/loader/Makefile
@@ -27,6 +27,9 @@ SRCS=	autoload.c \
 
 BOOT_DLOADER=	yes
 
+# DO NOT USE -static, this is a special case
+.undef NOSHARED
+
 CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I${.CURDIR}/arch/${MACHINE}
 CFLAGS+=	-I${.CURDIR}/../include
-- 
2.11.4.GIT