From f051a5b324cbe3cb64507ba59cd570b18f7309c1 Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Fri, 25 Dec 2015 11:29:18 +0000
Subject: [PATCH] Make libxnet.so a symlink to libc.so.  This makes `-lxnet` a
 no-op, as POSIX requires for the c99 compiler.

(In fact, our c99(1) already ignores -lxnet; but our make(1) doesn't set
${CC} correctly, and our cc(1) treats xnet like any other library.)

Reviewed by:	kib
---
 lib/libc/Makefile   | 1 +
 share/mk/bsd.lib.mk | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 2f8865c16a0..e9f14f437b2 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -26,6 +26,7 @@ LIBC_ARCH=${MACHINE_CPUARCH}
 LIB=c
 SHLIB_MAJOR= 7
 SHLIB_LDSCRIPT=libc.ldscript
+SHLIB_LDSCRIPT_LINKS=libxnet.so
 WARNS?=	2
 CFLAGS+=-I${LIBC_SRCTOP}/include -I${LIBC_SRCTOP}/../../include
 CFLAGS+=-I${LIBC_SRCTOP}/${LIBC_ARCH}
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 6e26cff5dcd..2e1796fa7ff 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -368,6 +368,9 @@ _libinstall:
 	${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} ${SHLIB_LINK:R}.ld \
 	    ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
+.for _SHLIB_LINK_LINK in ${SHLIB_LDSCRIPT_LINKS}
+	${INSTALL_SYMLINK} ${SHLIB_LINK} ${DESTDIR}${_LIBDIR}/${_SHLIB_LINK_LINK}
+.endfor
 .else
 .if ${_SHLIBDIR} == ${_LIBDIR}
 	${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}