diff --git a/fedac/native/Dockerfile.builder b/fedac/native/Dockerfile.builder index d039eb0776..67a0969ede 100644 --- a/fedac/native/Dockerfile.builder +++ b/fedac/native/Dockerfile.builder @@ -32,12 +32,12 @@ RUN dnf install -y --setopt=install_weak_deps=False \ && dnf clean all && rm -rf /var/cache/dnf # ── Install Quicklisp + CL dependencies for Lisp build variant ── -RUN curl -sfo /tmp/ql.lisp https://beta.quicklisp.org/quicklisp.lisp \ +RUN mkdir -p /cache \ + && curl -sfo /tmp/ql.lisp https://beta.quicklisp.org/quicklisp.lisp \ && sbcl --non-interactive \ --load /tmp/ql.lisp \ --eval '(quicklisp-quickstart:install :path "/opt/quicklisp/")' \ --eval '(ql:quickload (list :cffi :bordeaux-threads :alexandria))' \ - --eval '(sb-ext:save-lisp-and-die "/cache/sbcl-ql.core" :purify t)' \ && rm /tmp/ql.lisp # ── Pre-download QuickJS + Linux kernel source ── diff --git a/fedac/native/docker-build.sh b/fedac/native/docker-build.sh index 1d8452e15f..0aa7c16539 100644 --- a/fedac/native/docker-build.sh +++ b/fedac/native/docker-build.sh @@ -57,12 +57,10 @@ log " Binary: $(stat -c%s "$BUILD/ac-native") bytes" # ── Optional: Build Common Lisp variant ── if [ "${AC_BUILD_LISP:-0}" = "1" ]; then log "Step 1b: Building ac-native (Common Lisp)..." - SBCL_CORE="/cache/sbcl-ql.core" - SBCL_CMD="sbcl" - [ -f "$SBCL_CORE" ] && SBCL_CMD="sbcl --core $SBCL_CORE" CL_DIR="$NATIVE/cl" - # Build standalone binary - $SBCL_CMD --non-interactive \ + # Build standalone binary via SBCL + Quicklisp + sbcl --non-interactive \ + --eval '(load "/opt/quicklisp/setup.lisp")' \ --eval '(require :asdf)' \ --eval "(push #P\"$CL_DIR/\" asdf:*central-registry*)" \ --eval '(asdf:load-system :ac-native)' \