git: bba950fcaffc - main - librt: Hoist SHLIBDIR?= so it actually works
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 28 Aug 2023 19:30:00 UTC
The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=bba950fcaffc648d931da9dc07aeb85a1bf86cfc commit bba950fcaffc648d931da9dc07aeb85a1bf86cfc Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2023-08-28 19:27:50 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2023-08-28 19:27:50 +0000 librt: Hoist SHLIBDIR?= so it actually works src.opts.mk includes bsd.own.mk, which sets SHLIBDIR, so having this line after it does nothing. Hoist it like other libraries so it takes effect. Reported by: vishwin Fixes: 2964804ef95c ("librt: unbreak LIB32 build") --- lib/librt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librt/Makefile b/lib/librt/Makefile index 2c8eb1400fb9..c755bb123c73 100644 --- a/lib/librt/Makefile +++ b/lib/librt/Makefile @@ -1,9 +1,9 @@ +SHLIBDIR?=/lib .include <src.opts.mk> PACKAGE=clibs LIB=rt -SHLIBDIR?=/lib SHLIB_MAJOR= 1 CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR} .ifndef NO_THREAD_STACK_UNWIND