From c0fb198e3e90560d2928f73f239433b4184a65bb Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <fare@tunes.org> Date: Mon, 26 Dec 2016 20:03:37 -0500 Subject: [PATCH] Use c::build-program &co on ECL, not c::builder Make sure to use c::build-program and not just c:build-program because the symbol won't be external when using the ecl bytecode interpreter. --- uiop/image.lisp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/uiop/image.lisp b/uiop/image.lisp index cbf640a04..d1d2a25d9 100644 --- a/uiop/image.lisp +++ b/uiop/image.lisp @@ -445,14 +445,18 @@ or COMPRESSION on SBCL, and APPLICATION-TYPE on SBCL/Windows." (shell-boolean-exit (restore-image)))))))) (when forms `(progn ,@forms)))))) - #+(or clasp ecl) (check-type kind (member :dll :lib :static-library :program :object :fasl)) + #+(or clasp ecl) (check-type kind (member :dll :shared-library :lib :static-library :program :fasl)) (apply #+clasp 'cmp:builder #+clasp kind - #+ecl 'c::builder #+ecl kind - #+mkcl (ecase kind - ((:dll) 'compiler::build-shared-library) - ((:lib :static-library) 'compiler::build-static-library) - ((:fasl) 'compiler::build-bundle) - ((:program) 'compiler::build-program)) + #+(or ecl mkcl) + (ecase kind + ((:dll :shared-library) + #+ecl 'c::build-shared-library #+mkcl 'compiler:build-shared-library) + ((:lib :static-library) + #+ecl 'c::build-static-library #+mkcl 'compiler:build-static-library) + ((:fasl) + #+ecl 'c::build-fasl #+mkcl 'compiler:build-fasl) + ((:program) + #+ecl 'c::build-program #+mkcl 'compiler:build-program)) (pathname destination) #+(or clasp ecl) :lisp-files #+mkcl :lisp-object-files (append lisp-object-files #+(or clasp ecl) extra-object-files) #+(or clasp ecl) :init-name #+(or clasp ecl) (c::compute-init-name (or output-name destination) :kind kind) -- GitLab