Date: Wed, 19 Apr 2023 03:22:43 GMT From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 5ef0969e6247 - main - Handle libs that create linker scripts as libs Message-ID: <202304190322.33J3MhvV007903@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5ef0969e6247bf79230a04a0134a649e67305165 commit 5ef0969e6247bf79230a04a0134a649e67305165 Author: Simon J. Gerraty <sjg@FreeBSD.org> AuthorDate: 2023-04-19 03:22:13 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org> CommitDate: 2023-04-19 03:22:13 +0000 Handle libs that create linker scripts as libs Eg ncurses creates libncursesw.ald This is the only example so far, but if we are staging handle it. Reviewed by: stevek --- share/mk/bsd.sys.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 9d24c87d9eea..19f92d8f9d5d 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -437,6 +437,14 @@ STAGE_AS_${SHLIB_LINK:R}.ld:= ${SHLIB_LINK} NO_SHLIB_LINKS= .endif +.if defined(STATIC_LDSCRIPT) && target(lib${LIB}.ald) +STAGE_AS_SETS+= ald +STAGE_DIR.ald = ${STAGE_LIBDIR} +STAGE_AS.ald+= lib${LIB}.ald +STAGE_AS_lib${LIB}.ald = lib${LIB}.a +stage_as.ald: lib${LIB}.ald +.endif + .if target(stage_files.shlib) stage_libs: ${_LIBS} .if defined(DEBUG_FLAGS) && target(${SHLIB_NAME}.symbols)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304190322.33J3MhvV007903>