summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2012-06-15 19:40:59 +0000
committerbrooks <brooks@FreeBSD.org>2012-06-15 19:40:59 +0000
commit03bcdc82f0d05273a7491700bb36a2d636950e2f (patch)
treeaabfee05fbd6dad699db07c4eca206122d8b2951 /Makefile.inc1
parent42105999c96e2b963bd53d096405548de818da99 (diff)
downloadFreeBSD-src-03bcdc82f0d05273a7491700bb36a2d636950e2f.zip
FreeBSD-src-03bcdc82f0d05273a7491700bb36a2d636950e2f.tar.gz
MFP4: 212854, 212854
Add a LOCAL_LIB_DIRS variable to complement the existing LOCAL_DIRS and LOCAL_TOOL_DIRS variables. Directories in LOCAL_LIB_DIRS are built at the end of the _generic_libs target. Reviewed by: imp (212854)
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc18
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index be411a8..cc8d274 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -15,6 +15,7 @@
# -DNO_WWWUPDATE do not update www in ${MAKE} update
# -DNO_CTF do not run the DTrace CTF conversion tools on built objects
# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
+# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries
# LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
# list
# TARGET="machine" to crossbuild world for a different machine type
@@ -88,7 +89,7 @@ SUBDIR+=etc
# These are last, since it is nice to at least get the base system
# rebuilt before you do them.
-.for _DIR in ${LOCAL_DIRS}
+.for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS}
.if exists(${.CURDIR}/${_DIR}/Makefile)
SUBDIR+= ${_DIR}
.endif
@@ -1273,6 +1274,11 @@ _ofed_lib= contrib/ofed/usr.lib/
.endif
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
+.for _DIR in ${LOCAL_LIB_DIRS}
+.if exists(${.CURDIR}/${_DIR}/Makefile)
+_generic_libs+= ${_DIR}
+.endif
+.endfor
lib/libopie__L lib/libtacplus__L: lib/libmd__L
OpenPOWER on IntegriCloud