diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2020-12-16 22:06:15 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2021-01-08 22:34:21 +0000 |
| commit | 556fcdce5b44d29a7da851d9f89c224dd45eb3f3 (patch) | |
| tree | 4539e7da457ebf880507d765bb39aad365c62fd5 /share/mk/bsd.libnames.mk | |
| parent | 44b8b2a00d7e2e98c83141a5c0e6b9b4e3c2ddb4 (diff) | |
bsd.compat.mk: Allow finding non-internal libraries
Currently only libexec/rtld-elf32 uses internal LIBC_NOSSP_PIC during
the build but it gets it directly from the objdir rather than a sysroot.
For example, /usr/obj/usr/src/amd64.amd64/obj-lib32/lib/libc/libc_nossp_pic.a.
We don't stage lib32 libraries in WORLDTMP/usr/lib32 and doing so doesn't
buy much. If we want to use a staged lib32 library then we need to look in
LIBCOMPATTMP where they were staged. For example if LIBC_PIC were wanted then
look for /usr/obj/usr/src/amd64.amd64/obj-lib32/tmp/usr/lib32/libc_pic.a.
Reported by: rlibby
Reviewed by: rlibby
Sponsored by: Dell EMC
Differential Revision: https://reviews.freebsd.org/D27648
Diffstat (limited to 'share/mk/bsd.libnames.mk')
| -rw-r--r-- | share/mk/bsd.libnames.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index feb7f4c4070e..d030292d3c5e 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -8,7 +8,7 @@ .error bsd.libnames.mk cannot be included directly. .endif -LIBDESTDIR= ${SYSROOT:U${DESTDIR}} +LIBDESTDIR?= ${SYSROOT:U${DESTDIR}} .sinclude <src.libnames.mk> |