From ede21f0c220cd2eefd9eb8493333f0fe70d8f658 Mon Sep 17 00:00:00 2001 From: Jeffrey Alan Scudder Date: Tue, 24 Mar 2026 12:56:46 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20CL=20build=20=E2=80=94=20link=20shim=20d?= =?UTF-8?q?irectly=20to=20libquickjs.so,=20fail=20on=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The -L/-l linker flags weren't finding libquickjs.so in $BUILD. Link directly instead. Also: CL build failures now exit 1 instead of silently falling back to the C binary. Co-Authored-By: Claude Opus 4.6 (1M context) --- fedac/native/docker-build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fedac/native/docker-build.sh b/fedac/native/docker-build.sh index 54d8456f59..77f274136c 100644 --- a/fedac/native/docker-build.sh +++ b/fedac/native/docker-build.sh @@ -343,7 +343,7 @@ if [ "${AC_BUILD_LISP:-0}" = "1" ]; then log " Building libquickjs-shim.so..." gcc -shared -fPIC -O2 -o "$BUILD/libquickjs-shim.so" \ "$CL_DIR/quickjs-shim.c" \ - -I"$QJSDIR" -L"$BUILD" -lquickjs -lm 2>&1 || { err "shim build failed"; } + -I"$QJSDIR" "$BUILD/libquickjs.so" -lm 2>&1 || { err "shim build failed"; exit 1; } # Build CL binary with SBCL sbcl --non-interactive \ @@ -352,7 +352,7 @@ if [ "${AC_BUILD_LISP:-0}" = "1" ]; then --eval "(push #P\"$CL_DIR/\" asdf:*central-registry*)" \ --eval '(asdf:load-system :ac-native)' \ --eval "(ac-native.build:build \"$BUILD/ac-native-cl\")" \ - 2>&1 || { err "CL build failed"; } + 2>&1 || { err "CL build failed"; exit 1; } if [ -f "$BUILD/ac-native-cl" ]; then log " CL Binary: $(stat -c%s "$BUILD/ac-native-cl") bytes" # Swap into initramfs (keep C version in build dir) @@ -369,7 +369,8 @@ if [ "${AC_BUILD_LISP:-0}" = "1" ]; then printf '%s\n%s\n%s\ncl\n' "$BUILD_NAME" "$GIT_HASH" "$BUILD_TS" > "$IROOT/etc/ac-build" log " Swapped CL binary into initramfs (with QuickJS)" else - err "CL binary not produced — using C binary" + err "CL binary not produced" + exit 1 fi fi -- 2.51.2