Author: brooks
Date: Tue Oct 15 21:15:03 2019
New Revision: 353594
URL: https://svnweb.freebsd.org/changeset/base/353594

Log:
  Allow OBJDIR to be overridden for LIB*DIR variables.
  
  This will allow us to link against internal libraries when building
  programs for the system's LIBCOMPAT ABI.
  
  Reviewed by:  bdrewery
  Obtained from:        CheriBSD
  Sponsored by: DARPA, AFRL

Modified:
  head/share/mk/src.libnames.mk

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk       Tue Oct 15 21:11:22 2019        
(r353593)
+++ head/share/mk/src.libnames.mk       Tue Oct 15 21:15:03 2019        
(r353594)
@@ -462,76 +462,77 @@ DPADD+=           ${DPADD_${_l}}
 LDADD+=                ${LDADD_${_l}}
 .endfor
 
+_LIB_OBJTOP?=  ${OBJTOP}
 # INTERNALLIB definitions.
-LIBELFTCDIR=   ${OBJTOP}/lib/libelftc
+LIBELFTCDIR=   ${_LIB_OBJTOP}/lib/libelftc
 LIBELFTC?=     ${LIBELFTCDIR}/libelftc${PIE_SUFFIX}.a
 
-LIBPEDIR=      ${OBJTOP}/lib/libpe
+LIBPEDIR=      ${_LIB_OBJTOP}/lib/libpe
 LIBPE?=                ${LIBPEDIR}/libpe${PIE_SUFFIX}.a
 
-LIBOPENBSDDIR= ${OBJTOP}/lib/libopenbsd
+LIBOPENBSDDIR= ${_LIB_OBJTOP}/lib/libopenbsd
 LIBOPENBSD?=   ${LIBOPENBSDDIR}/libopenbsd${PIE_SUFFIX}.a
 
-LIBSMDIR=      ${OBJTOP}/lib/libsm
+LIBSMDIR=      ${_LIB_OBJTOP}/lib/libsm
 LIBSM?=                ${LIBSMDIR}/libsm${PIE_SUFFIX}.a
 
-LIBSMDBDIR=    ${OBJTOP}/lib/libsmdb
+LIBSMDBDIR=    ${_LIB_OBJTOP}/lib/libsmdb
 LIBSMDB?=      ${LIBSMDBDIR}/libsmdb${PIE_SUFFIX}.a
 
-LIBSMUTILDIR=  ${OBJTOP}/lib/libsmutil
+LIBSMUTILDIR=  ${_LIB_OBJTOP}/lib/libsmutil
 LIBSMUTIL?=    ${LIBSMUTILDIR}/libsmutil${PIE_SUFFIX}.a
 
-LIBNETBSDDIR?= ${OBJTOP}/lib/libnetbsd
+LIBNETBSDDIR?= ${_LIB_OBJTOP}/lib/libnetbsd
 LIBNETBSD?=    ${LIBNETBSDDIR}/libnetbsd${PIE_SUFFIX}.a
 
-LIBVERSDIR?=   ${OBJTOP}/kerberos5/lib/libvers
+LIBVERSDIR?=   ${_LIB_OBJTOP}/kerberos5/lib/libvers
 LIBVERS?=      ${LIBVERSDIR}/libvers${PIE_SUFFIX}.a
 
-LIBSLDIR=      ${OBJTOP}/kerberos5/lib/libsl
+LIBSLDIR=      ${_LIB_OBJTOP}/kerberos5/lib/libsl
 LIBSL?=                ${LIBSLDIR}/libsl${PIE_SUFFIX}.a
 
-LIBIFCONFIGDIR=        ${OBJTOP}/lib/libifconfig
+LIBIFCONFIGDIR=        ${_LIB_OBJTOP}/lib/libifconfig
 LIBIFCONFIG?=  ${LIBIFCONFIGDIR}/libifconfig${PIE_SUFFIX}.a
 
-LIBIPFDIR=     ${OBJTOP}/sbin/ipf/libipf
+LIBIPFDIR=     ${_LIB_OBJTOP}/sbin/ipf/libipf
 LIBIPF?=       ${LIBIPFDIR}/libipf${PIE_SUFFIX}.a
 
-LIBTELNETDIR=  ${OBJTOP}/lib/libtelnet
+LIBTELNETDIR=  ${_LIB_OBJTOP}/lib/libtelnet
 LIBTELNET?=    ${LIBTELNETDIR}/libtelnet${PIE_SUFFIX}.a
 
-LIBCRONDIR=    ${OBJTOP}/usr.sbin/cron/lib
+LIBCRONDIR=    ${_LIB_OBJTOP}/usr.sbin/cron/lib
 LIBCRON?=      ${LIBCRONDIR}/libcron${PIE_SUFFIX}.a
 
-LIBNTPDIR=     ${OBJTOP}/usr.sbin/ntp/libntp
+LIBNTPDIR=     ${_LIB_OBJTOP}/usr.sbin/ntp/libntp
 LIBNTP?=       ${LIBNTPDIR}/libntp${PIE_SUFFIX}.a
 
-LIBNTPEVENTDIR=        ${OBJTOP}/usr.sbin/ntp/libntpevent
+LIBNTPEVENTDIR=        ${_LIB_OBJTOP}/usr.sbin/ntp/libntpevent
 LIBNTPEVENT?=  ${LIBNTPEVENTDIR}/libntpevent${PIE_SUFFIX}.a
 
-LIBOPTSDIR=    ${OBJTOP}/usr.sbin/ntp/libopts
+LIBOPTSDIR=    ${_LIB_OBJTOP}/usr.sbin/ntp/libopts
 LIBOPTS?=      ${LIBOPTSDIR}/libopts${PIE_SUFFIX}.a
 
-LIBPARSEDIR=   ${OBJTOP}/usr.sbin/ntp/libparse
+LIBPARSEDIR=   ${_LIB_OBJTOP}/usr.sbin/ntp/libparse
 LIBPARSE?=     ${LIBPARSEDIR}/libparse${PIE_SUFFIX}.a
 
-LIBLPRDIR=     ${OBJTOP}/usr.sbin/lpr/common_source
+LIBLPRDIR=     ${_LIB_OBJTOP}/usr.sbin/lpr/common_source
 LIBLPR?=       ${LIBLPRDIR}/liblpr${PIE_SUFFIX}.a
 
-LIBFIFOLOGDIR= ${OBJTOP}/usr.sbin/fifolog/lib
+LIBFIFOLOGDIR= ${_LIB_OBJTOP}/usr.sbin/fifolog/lib
 LIBFIFOLOG?=   ${LIBFIFOLOGDIR}/libfifolog${PIE_SUFFIX}.a
 
-LIBBSNMPTOOLSDIR=      ${OBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools
+LIBBSNMPTOOLSDIR=      ${_LIB_OBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools
 LIBBSNMPTOOLS?=        ${LIBBSNMPTOOLSDIR}/libbsnmptools${PIE_SUFFIX}.a
 
-LIBAMUDIR=     ${OBJTOP}/usr.sbin/amd/libamu
+LIBAMUDIR=     ${_LIB_OBJTOP}/usr.sbin/amd/libamu
 LIBAMU?=       ${LIBAMUDIR}/libamu${PIE_SUFFIX}.a
 
 LIBBE?=                ${LIBBEDIR}/libbe${PIE_SUFFIX}.a
 
-LIBPMCSTATDIR= ${OBJTOP}/lib/libpmcstat
+LIBPMCSTATDIR= ${_LIB_OBJTOP}/lib/libpmcstat
 LIBPMCSTAT?=   ${LIBPMCSTATDIR}/libpmcstat${PIE_SUFFIX}.a
 
-LIBC_NOSSP_PICDIR=     ${OBJTOP}/lib/libc
+LIBC_NOSSP_PICDIR=     ${_LIB_OBJTOP}/lib/libc
 LIBC_NOSSP_PIC?=       ${LIBC_NOSSP_PICDIR}/libc_nossp_pic.a
 
 # Define a directory for each library.  This is useful for adding -L in when
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to