diff options
| author | Jessica Clarke <jrtc27@FreeBSD.org> | 2021-12-06 19:06:16 +0000 |
|---|---|---|
| committer | Jessica Clarke <jrtc27@FreeBSD.org> | 2021-12-06 19:16:27 +0000 |
| commit | ed4050750c1ab35b1017afa7a998fbc8a62de454 (patch) | |
| tree | b984eede381d37faeb6a8c6ef9aeaf2762c73c8b | |
| parent | 5022d54e061a91b8ccc6a621ceb94ba9e56209c4 (diff) | |
| download | src-ed4050750c1ab35b1017afa7a998fbc8a62de454.tar.gz src-ed4050750c1ab35b1017afa7a998fbc8a62de454.zip | |
src.libnames.mk: Add hack to workaround libarchive not being bootstrapped
We don't currently honour _DP_foo when bootstrapping on non-FreeBSD, and
so none of these values matter, but the next commit will change that as
we do need to pull in dependencies for libdwarf. We should really be
bootstrapping our libarchive for ar anyway rather than using the host's,
as well as have a better way to communicate to src.libnames.mk whether
or not a library is being bootstrapped.
MFC after: 1 week
| -rw-r--r-- | share/mk/src.libnames.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 23d09a434466..4339b4f5bb50 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -261,7 +261,11 @@ LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec.a # 2nd+ order consumers. Auto-generating this would be better. _DP_80211= sbuf bsdxml _DP_9p= sbuf +# XXX: Not bootstrapped so uses host version on non-FreeBSD, so don't use a +# FreeBSD-specific dependency list +.if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) _DP_archive= z bz2 lzma bsdxml zstd +.endif _DP_avl= spl _DP_bsddialog= formw ncursesw tinfow _DP_zstd= pthread |