GitLab

at 2025-01-04T18:34:59-08:00

Fix building lisp

For build.sh, first, echo out the command used to build each stage so
that we can see that we're using the correct args.  Second, we
incorrectly used the wrong core file with the stage 3 lisp; it was
using the core from stage 2.  Third, we forgot to pass the `-lib`
option for building stage 4 so it couldn't find the core file.

For build-utils.sh, we need to add a `-lib` option so lisp can find
the core file.

@@ -16,7 +16,7 @@ TARGET="`echo $1 | sed 's:/*$::'`"
  shift
  $TARGET/lisp/lisp \
 -	-noinit -nositeinit -batch "$@" <<EOF || exit 3
 +	-lib $TARGET/lisp -noinit -nositeinit -batch "$@" <<EOF || exit 3
  (in-package :cl-user)
  (setf lisp::*enable-package-locked-errors* nil)

@@ -141,7 +141,9 @@ buildit ()
      if [ "$ENABLE" = "yes" ];
      then
  	$TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; }
 +	set -x
  	time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; }
 +	set +x
  	if [ "$REBUILD_LISP" = "yes" ]; then
  	    $TOOLDIR/rebuild-lisp.sh $TARGET
  	fi
@@ -152,11 +154,15 @@ buildit ()
  	if [ "$BUILD_WORLD2" = "yes" ];
  	then
 +	    set -x
  	    $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; }
 +	    set +x
  	fi
  	$TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; }
 +	set -x
  	$TARGET/lisp/lisp -lib $TARGET/lisp -batch -noinit -nositeinit < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit"; exit 1; }
 +	set +x
  	return 0;
      fi
+ }
@@ -244,7 +250,7 @@ buildit
  TARGET=$BASE-4
  CLEAN_FLAGS="-K all"
 -OLDLISP="${BASE}-3/lisp/lisp -lib ${BASE}-2/lisp $OLDLISPFLAGS"
 +OLDLISP="${BASE}-3/lisp/lisp -lib ${BASE}-3/lisp $OLDLISPFLAGS"
  ENABLE=$ENABLE4
  if [ "${BUILD_POT}" = "yes" ]; then
@@ -262,7 +268,7 @@ buildit
  # Asdf and friends are part of the base install, so we need to build
  # them now.
 -$TARGET/lisp/lisp -noinit -nositeinit -batch << EOF || exit 3
 +$TARGET/lisp/lisp -lib $TARGET/lisp -noinit -nositeinit -batch << EOF || exit 3
  (in-package :cl-user)
  (setf (ext:search-list "target:")
        '("$TARGET/" "src/"))
@@ -282,7 +288,7 @@ EOF
  if [ "$SKIPUTILS" = "no" ];
  then
 -    OLDLISP="${BASE}-4/lisp/lisp $OLDLISPFLAGS"
 +    OLDLISP="${BASE}-4/lisp/lisp -lib ${BASE}-4/lisp $OLDLISPFLAGS"
      time $TOOLDIR/build-utils.sh $TARGET
  fi

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl

Commits:

2 changed files:

Changes: