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

Fix parallel build issues and add MK_ZFS=no case

Browse Source 
To ensure that I don't break the MK_ZFS=no case (currently working),
add that to the build, at least for i386 and amd64. Also, out of an
abundance of caution, clean single threaded, and then build in a
separate make. Otherwise, I hit a race where we build before objdir
has been created, which breaks at the moment.

Sponsored by: Netflix
This commit is contained in:
Warner Losh 2017-10-30 03:12:34 +00:00
parent 0b9bfebf8b
commit 36f1c58dc5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=325115
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/boot/universe.sh
View File

@ -33,9 +33,33 @@ for i in \
; do
ta=${i##*/}
echo -n "Building $ta..."
( ( make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make -j 20 clean cleandepend cleandir obj depend all" \
> _.boot.${ta}.log 2>&1 ) && echo Success ) || echo Fail
if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make clean cleandepend cleandir obj depend" \
> _.boot.${ta}.log 2>&1; then
echo "Fail (cleanup)"
continue
fi
if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make -j 20 all" \
>> _.boot.${ta}.log 2>&1; then
echo "Fail (build)"
continue
fi
echo "Success"
done
for i in \
amd64/amd64 \
i386/i386 \
; do
ta=${i##*/}
echo -n "Building $ta MK_ZFS=no..."
if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make clean cleandepend cleandir obj depend" \
> _.boot.${ta}.noZFS.log 2>&1; then
echo "Fail (cleanup)"
continue
fi
if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make MK_ZFS=no -j 20 all" \
>> _.boot.${ta}.noZFS.log 2>&1; then
echo "Fail (build)"
continue
fi
echo "Success"
done