diff options
| author | cperciva <cperciva@FreeBSD.org> | 2015-12-25 11:29:18 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2015-12-25 11:29:18 +0000 |
| commit | ea201437309bec756e9ac445b5ffbd9d86a9556c (patch) | |
| tree | 904eb85cae295385e20baa0a6aa6556b63d4e69e | |
| parent | 6e0a844f5977035a478412383687a45c81b301d8 (diff) | |
| download | FreeBSD-src-ea201437309bec756e9ac445b5ffbd9d86a9556c.zip FreeBSD-src-ea201437309bec756e9ac445b5ffbd9d86a9556c.tar.gz | |
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
| -rw-r--r-- | lib/libc/Makefile | 1 | ||||
| -rw-r--r-- | share/mk/bsd.lib.mk | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 2f8865c..e9f14f4 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 6e26cff..2e1796f 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} |
