Changeset 63190e6 for LFS/master.sh

Timestamp:

11/15/2023 05:24:22 PM (8 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

cacc6c5

Parents:

3c43655

git-author:

Pierre Labastie <pierre.labastie@…> (11/15/2023 05:16:10 PM)

git-committer:

Pierre Labastie <pierre.labastie@…> (11/15/2023 05:24:22 PM)

Message:

Only pass MAKEFLAGS and NINJAJOBS to old books

Also pass them to binutils-pass1 if calculating the SBU

File:

• LFS/master.sh (modified) (2 diffs)

LFS/master.sh

@@ -128 +128 @@
       # If using optimizations, write the instructions
       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" ;;
-          *kernel*) # No CFLAGS for kernel
-              wrt_makeflags "$name" "$JH_MAKEFLAGS" "$N_PARALLEL" ;;
-          *)  wrt_optimize "$name" &&
+          n*)
               wrt_makeflags "$name" "$JH_MAKEFLAGS" "$N_PARALLEL" ;;
       esac
@@ -252 +260 @@
 #  echo nb_chaps: $nb_chaps
 # 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