[lfs] 02/02: Makefile: Adjust defaults for ML.

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch multilib
in repository lfs.

commit 719f3ac66d87be3408e33f4591ebaf3d0037b1a7
Author: Zeckmathederg <[email protected]>
AuthorDate: Fri Nov 14 16:34:55 2025 -0700

    Makefile: Adjust defaults for ML.
    
    This commit makes ml_all the ARCH default, and `default` got renamed to
    `none`. However, `default` is still need for profiling or else the
    normal sections refuse to render.
    
    Thus, what happens is ARCH gets set by the Makefile, or the user, the
    options available are:
    - ml_all
    - ml_32
    - ml_x32
    - none
    
    If `none` is set, R_ARCH is set as `default`, otherwise, R_ARCH is set
    as ARCH.
---
 Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index c9c404a0d..1472c6c18 100644
--- a/Makefile
+++ b/Makefile
@@ -33,17 +33,22 @@ else
 endif
 
 ifndef ARCH
-  ARCH = default
+  ARCH = ml_all
 endif
-ifneq ($(ARCH), default)
+ifneq ($(ARCH), none)
   ifneq ($(ARCH), ml_32)
     ifneq ($(ARCH), ml_x32)
       ifneq ($(ARCH), ml_all)
-        $(error ARCH must be either 'default' (default if unset), 'ml_32', 'ml_x32', or 'ml_all')
+        $(error ARCH must be either 'ml_all' (ml_all if unset), 'ml_32', 'ml_x32', or 'none')
       endif
     endif
   endif
 endif
+ifeq ($(ARCH), none)
+  R_ARCH = default
+else
+  R_ARCH = $(ARCH)
+endif
 
 book: validate profile-html
 	@echo "Generating chunked XHTML files at $(BASEDIR)/ ..."
@@ -137,7 +142,7 @@ validate: tmpdir version
 	$(Q)xsltproc --nonet                               \
                 --xinclude                            \
                 --stringparam profile.revision $(REV) \
-                --stringparam profile.arch $(ARCH)    \
+                --stringparam profile.arch $(R_ARCH)  \
                 --output $(RENDERTMP)/lfs-html2.xml   \
                 stylesheets/lfs-xsl/profile.xsl       \
                 index.xml
@@ -195,7 +200,7 @@ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
 	$(Q)xsltproc --nonet                               \
                 --xinclude                            \
                 --stringparam profile.revision $(REV) \
-                --stringparam profile.arch $(ARCH)    \
+                --stringparam profile.arch $(R_ARCH)  \
                 --output $(RENDERTMP)/md5sum.xml      \
                 stylesheets/lfs-xsl/profile.xsl       \
                 chapter03/chapter03.xml

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page