Changeset ebe1ba6 for jhalfs

Timestamp:

06/10/2020 08:01:17 PM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

6447575

Parents:

36f5dce

Message:

Adapt for the cross 2 branch. Note that ICA is broken now. Keeping some old
code to use for fixing ICA, but committing now so that testing can begin!

File:

• jhalfs (modified) (2 diffs)

jhalfs

@@ -185 +185 @@
   NO_PROGRESS="#"
 fi
-
 
 # Sanity check on the location of $BUILDDIR / $JHALFSDIR
@@ -455 +454 @@
 # But the LFS book is needed for BLFS tools.
   get_book
+# At this point, we should have a way to know whether we have a cross
+# or regular book... In case of cross, prohibite TEST=3
+# the position of gcc-pass2 (chapter 6 or 5) tells us (not valid for
+# cross-chap5 branch).
+  if (( TEST == 3 )) && \
+     [ -f "$JHALFSDIR/${PROGNAME}-commands/chapter06/gcc-pass2.xml" ]; then
+        TEST=2
+  fi
   extract_commands
   echo "${SD_BORDER}${nl_}"