aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.libcompat
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2018-06-15 18:50:24 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2018-06-15 18:50:24 +0000
commitc4273800aea9fc816c20e5e5ba4246d2429c9ce9 (patch)
tree81b85287b37c28162e7906780ebad381f8a342ba /Makefile.libcompat
parent0be546e9baa977c4c3ea2efbae94a6991cb2f6e5 (diff)
downloadsrc-c4273800aea9fc816c20e5e5ba4246d2429c9ce9.tar.gz
src-c4273800aea9fc816c20e5e5ba4246d2429c9ce9.zip
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
Notes
Notes: svn path=/head/; revision=335225
Diffstat (limited to 'Makefile.libcompat')
-rw-r--r--Makefile.libcompat4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat
index db4f8c75447a..44a158d518bb 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -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