d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build compat libraries before "everything".

Browse Source 
This is required for us to link programs against compat versions of
libraries.

Reviewed by:	bdrewery, jhb
Sponsored by:	DARPA, AFRL
This commit is contained in:
Brooks Davis 2019-10-15 21:22:13 +00:00
parent bc4b1a1729
commit 5dab131339
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc1
View File

@ -1150,7 +1150,7 @@ _libraries:
everything: .PHONY everything: .PHONY
@echo @echo
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> stage 4.3: building everything" @echo ">>> stage 4.4: building everything"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all ${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all
@ -1171,10 +1171,10 @@ WMAKE_TGTS+= _includes
.if !defined(NO_LIBS) .if !defined(NO_LIBS)
WMAKE_TGTS+= _libraries WMAKE_TGTS+= _libraries
.endif .endif
WMAKE_TGTS+= everything
.if defined(_LIBCOMPAT) && empty(SUBDIR_OVERRIDE) .if defined(_LIBCOMPAT) && empty(SUBDIR_OVERRIDE)
WMAKE_TGTS+= build${libcompat} WMAKE_TGTS+= build${libcompat}
.endif .endif
WMAKE_TGTS+= everything
# record buildworld time in seconds # record buildworld time in seconds
.if make(buildworld) .if make(buildworld)

2
Makefile.libcompat
View File

@ -61,7 +61,7 @@ _jevents= lib/libpmc/pmu-events
build${libcompat}: .PHONY build${libcompat}: .PHONY
@echo @echo
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> stage 5.1: building lib${libcompat} shim libraries" @echo ">>> stage 4.3: building lib${libcompat} shim libraries"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
.if !defined(NO_CLEAN) .if !defined(NO_CLEAN)
rm -rf ${LIBCOMPATTMP} rm -rf ${LIBCOMPATTMP}