Author: bdrewery
Date: Fri Jun 15 18:50:24 2018
New Revision: 335225
URL: https://svnweb.freebsd.org/changeset/base/335225
Log:
lib32: Fix lib/libpmc/pmu-events files ending up in source directory.
This could happen with either WITHOUT_AUTO_OBJ=yes or MAKELEVEL>0 for
the initial 'make buildworld' command.
This now ensures that build-tools targets have 'make obj' ran if needed.
This is especially problematic for pmu-events since it is not directly
connected in the build. Normally the 'make includes' call right before
this implicitly creates the objdir with a 'make obj' already but
misses pmu-events because it is disconnected from lib/libpmc. Fixing that
would make this new 'make obj' pointless but it is being added to avoid
this problem in the future should another tool be connected like this.
Reported by: rgrimes, kib, kevans
Sponsored by: Dell EMC
Modified:
head/Makefile.libcompat
Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat Fri Jun 15 18:46:01 2018 (r335224)
+++ head/Makefile.libcompat Fri Jun 15 18:50:24 2018 (r335225)
@@ -201,6 +201,7 @@ build${libcompat}: .PHONY
.endfor
.endfor
.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw ${_libmagic} ${_jevents}
+.for _t in ${_obj} build-tools
${_+_}cd ${.CURDIR}/${_dir}; \
WORLDTMP=${WORLDTMP} \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
@@ -209,7 +210,8 @@ build${libcompat}: .PHONY
OBJROOT='$${OBJTOP}/' \
MAKEOBJDIRPREFIX= \
DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
- build-tools
+ ${_t}
+.endfor
.endfor
${_+_}cd ${.CURDIR}; \
${LIBCOMPATWMAKE} -f Makefile.inc1 -DNO_FSCHG libraries
_______________________________________________
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"
