zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only pass MAKEFLAGS and NINJAJOBS to old books

Browse source 
Also pass them to binutils-pass1 if calculating the SBU
This commit is contained in:
Pierre Labastie 2023-11-15 18:16:10 +01:00
parent 3c43655ec6
commit 63190e6547
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
LFS/master.sh
View file

@ -127,11 +127,19 @@ chapter_targets() { #
# If using optimizations, write the instructions # If using optimizations, write the instructions
case "${OPTIMIZE}$1${nb_chaps}${this_script}${REALSBU}" in case "${OPTIMIZE}$1${nb_chaps}${this_script}${REALSBU}" in
0* | *binutils-pass1y | 15* | 167* | 177*) 0* | *binutils-pass1y | 15* | 167* | 177*) ;;
*kernel*) ;; # No CFLAGS for kernel
*) wrt_optimize "$name" ;;
esac
# MAKEFLAGS is set even if no optimization now.
# For new books, the scripts contain the MAKEFLAGS, so no
# need to set them in the envars except if binutils-pass1
# and REALSBU=y. For Old books, N_PARALLEL and JH_MAKEFLAGS
# are set and we must set the envars.
case "${mkf_included}${this_script}${REALSBU}" in
*binutils-pass1y)
wrt_makeflags "$name" "-j1" "1" ;; wrt_makeflags "$name" "-j1" "1" ;;
*kernel*) # No CFLAGS for kernel n*)
wrt_makeflags "$name" "$JH_MAKEFLAGS" "$N_PARALLEL" ;;
*) wrt_optimize "$name" &&
wrt_makeflags "$name" "$JH_MAKEFLAGS" "$N_PARALLEL" ;; wrt_makeflags "$name" "$JH_MAKEFLAGS" "$N_PARALLEL" ;;
esac esac
fi fi
@ -252,6 +260,14 @@ build_Makefile() { #
# echo nb_chaps: $nb_chaps # echo nb_chaps: $nb_chaps
# end DEBUG # end DEBUG
# We need to know if we have an old or a new book (with included MAKEFLAGS)
# we grep for MAKEFLAGS in chapter04 to find out.
if grep -q MAKEFLAGS chapter04/*; then
mkf_included=y
else
mkf_included=n
fi
# Make a temporary file with all script targets # Make a temporary file with all script targets
for (( i = 4; i < nb_chaps+4; i++ )); do for (( i = 4; i < nb_chaps+4; i++ )); do
chapter_targets $i chapter_targets $i