diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2017-06-23 19:44:20 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2017-06-23 19:44:20 +0000 |
| commit | 15bd171b59c4c5f09cc9236637bd9e698f44342d (patch) | |
| tree | 4b788d2e65004aeb1ad387f37ac01250d09316f0 /share/mk/src.libnames.mk | |
| parent | b9a8cab5550b12a8079f4e625b91315ac09467f9 (diff) | |
| download | FreeBSD-src-15bd171b59c4c5f09cc9236637bd9e698f44342d.zip FreeBSD-src-15bd171b59c4c5f09cc9236637bd9e698f44342d.tar.gz | |
MFC r320012,r320028,r320061,r320118:
r320012:
Fix LIBAMU location to fix 'stale .depend' rebuilds in usr.sbin/amd.
r320028:
Fix more incorrect library directories fix 'stale .depend' rebuilds.
r320061:
Fix Makefiles which override LIBDIR to not add incorrect dependencies into
.depend.
r320118:
Follow-up r320061: Need to respect make.conf/env LIBDIR overrides.
Approved by: re (gjb)
Diffstat (limited to 'share/mk/src.libnames.mk')
| -rw-r--r-- | share/mk/src.libnames.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 703789a..bfe8c4f 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -339,13 +339,13 @@ _DP_rdmacm= ibverbs # Define special cases LDADD_supcplusplus= -lsupc++ -LIBATF_C= ${DESTDIR}${LIBDIR}/libprivateatf-c.a -LIBATF_CXX= ${DESTDIR}${LIBDIR}/libprivateatf-c++.a +LIBATF_C= ${DESTDIR}${LIBDIR_BASE}/libprivateatf-c.a +LIBATF_CXX= ${DESTDIR}${LIBDIR_BASE}/libprivateatf-c++.a LDADD_atf_c= -lprivateatf-c LDADD_atf_cxx= -lprivateatf-c++ .for _l in ${_PRIVATELIBS} -LIB${_l:tu}?= ${DESTDIR}${LIBDIR}/libprivate${_l}.a +LIB${_l:tu}?= ${DESTDIR}${LIBDIR_BASE}/libprivate${_l}.a .endfor .for _l in ${_LIBRARIES} @@ -416,7 +416,7 @@ LIBSMDBDIR= ${OBJTOP}/lib/libsmdb LIBSMDB?= ${LIBSMDBDIR}/libsmdb.a LIBSMUTILDIR= ${OBJTOP}/lib/libsmutil -LIBSMUTIL?= ${LIBSMDBDIR}/libsmutil.a +LIBSMUTIL?= ${LIBSMUTILDIR}/libsmutil.a LIBNETBSDDIR?= ${OBJTOP}/lib/libnetbsd LIBNETBSD?= ${LIBNETBSDDIR}/libnetbsd.a @@ -449,16 +449,16 @@ LIBPARSEDIR= ${OBJTOP}/usr.sbin/ntp/libparse LIBPARSE?= ${LIBPARSEDIR}/libparse.a LIBLPRDIR= ${OBJTOP}/usr.sbin/lpr/common_source -LIBLPR?= ${LIBOPTSDIR}/liblpr.a +LIBLPR?= ${LIBLPRDIR}/liblpr.a LIBFIFOLOGDIR= ${OBJTOP}/usr.sbin/fifolog/lib -LIBFIFOLOG?= ${LIBOPTSDIR}/libfifolog.a +LIBFIFOLOG?= ${LIBFIFOLOGDIR}/libfifolog.a LIBBSNMPTOOLSDIR= ${OBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools LIBBSNMPTOOLS?= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a LIBAMUDIR= ${OBJTOP}/usr.sbin/amd/libamu -LIBAMU?= ${LIBAMUDIR}/libamu/libamu.a +LIBAMU?= ${LIBAMUDIR}/libamu.a # Define a directory for each library. This is useful for adding -L in when # not using a --sysroot or for meta mode bootstrapping when there is no |
