mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2025-12-05 18:30:24 -08:00
Code Issues Projects Releases Packages Wiki Activity

cmp: allow cross compiling to/from targets without shared library support

Browse source
This commit is contained in:
Marius Gerbershagen 2025-11-21 19:39:33 +01:00
parent 0baa1290e6
commit 4734509f15
3 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp
View file

@ -103,7 +103,8 @@ the environment variable TMPDIR to a different value." template))
#+msvc
(defun linker-cc (o-pathname object-files &key
(type :program)
(ld-flags (split-program-options (if #-dlopen nil #+dlopen (eq type :program)
(ld-flags (split-program-options (if (and (member :dlopen *features*)
(eq type :program))
*ld-program-flags*
*ld-flags*)))
(ld-libs (split-program-options *ld-libs*)))
@ -128,7 +129,8 @@ the environment variable TMPDIR to a different value." template))
#-msvc
(defun linker-cc (o-pathname object-files &key
(type :program)
(ld-flags (split-program-options (if #-dlopen nil #+dlopen (eq type :program)
(ld-flags (split-program-options (if (and (member :dlopen *features*)
(eq type :program))
*ld-program-flags*
*ld-flags*)))
(ld-libs (split-program-options *ld-libs*)))
@ -279,9 +281,10 @@ the environment variable TMPDIR to a different value." template))
(defun ecl-library-directory ()
"Finds the directory in which the ECL core library was installed."
(cond ((and *ecl-library-directory*
(probe-file (merge-pathnames (compile-file-pathname "ecl" :type
#+dlopen :shared-library
#-dlopen :static-library)
(probe-file (merge-pathnames (compile-file-pathname
"ecl" :type (if (member :dlopen *features*)
:shared-library
:static-library))
*ecl-library-directory*)))
*ecl-library-directory*)
((probe-file "SYS:BUILD-STAMP")
@ -360,7 +363,6 @@ filesystem or in the database of ASDF modules."
;;; Target-specific invocations.
#+dlopen
(defun shared-cc (o-pathname object-files)
(let ((ld-flags (split-program-options *ld-shared-flags*))
(ld-libs (split-program-options *ld-libs*)))
@ -380,7 +382,6 @@ filesystem or in the database of ASDF modules."
(linker-cc o-pathname object-files :type :dll
:ld-flags ld-flags :ld-libs ld-libs)))
#+dlopen
(defun bundle-cc (o-pathname init-name object-files)
(declare (ignore init-name))
(let ((ld-flags (split-program-options *ld-bundle-flags*))
@ -696,7 +697,6 @@ output = si_safe_eval(2, ecl_read_from_cstring(lisp_code), ECL_NIL);
(compiler-cc c-name o-name)
(when (probe-file output-name) (delete-file output-name))
(linker-ar output-name o-name ld-libs))
#+dlopen
(:shared-library
(format c-file +lisp-program-init+
init-name init-tag prologue-code submodules epilogue-code)
@ -708,7 +708,6 @@ output = si_safe_eval(2, ecl_read_from_cstring(lisp_code), ECL_NIL);
(compiler-cc c-name o-name)
(shared-cc output-name (append ld-flags (list o-name)
ld-libs)))
#+dlopen
(:fasl
(format c-file +lisp-program-init+ init-name init-tag prologue-code
submodules epilogue-code)
@ -733,7 +732,6 @@ output = si_safe_eval(2, ecl_read_from_cstring(lisp_code), ECL_NIL);
(apply #'builder :static-library args))
(defun build-shared-library (&rest args)
#-dlopen
(error "Dynamically loadable libraries not supported in this system.")
#+dlopen
(apply #'builder :shared-library args))
(if (member :dlopen *features*)
(apply #'builder :shared-library args)
(error "Dynamically loadable libraries not supported in this system.")))

6
src/cmp/cmpdefs.lsp
View file

@ -64,10 +64,8 @@ coprocessor).")
#+dlopen
(defconfig *ld-libs* #-msvc "-lecl @FASL_LIBS@ @LIBS@"
#+msvc "ecl.lib @CLIBS@")
#+dlopen
(defconfig *ld-shared-flags* "@SHARED_LDFLAGS@ @LDFLAGS@")
#+dlopen
(defconfig *ld-bundle-flags* "@BUNDLE_LDFLAGS@ @LDFLAGS@")
(defconfig *ld-shared-flags* #+dlopen "@SHARED_LDFLAGS@ @LDFLAGS@")
(defconfig *ld-bundle-flags* #+dlopen "@BUNDLE_LDFLAGS@ @LDFLAGS@")
(defconfig *ld-program-flags* "@PROGRAM_LDFLAGS@ @LDFLAGS@")
(defconfig +shared-library-prefix+ "@SHAREDPREFIX@")

8
src/cmp/cmpmain.lsp
View file

@ -87,8 +87,7 @@ compiled successfully, returns the pathname of the compiled file."
(return-from compile-file
(compile-with-target-info #'(lambda () (apply #'compile-file input-pathname args))
target)))
#-dlopen
(unless system-p
(unless (or (member :dlopen *features*) system-p)
(format t "~%;;;~
~%;;; This system does not support loading dynamically linked libraries.~
~%;;; Therefore, COMPILE-FILE without :SYSTEM-P T is unsupported.~
@ -363,12 +362,11 @@ from the C language code. NIL means \"do not create the file\"."
(unless (string= *target-lisp-implementation-version* (lisp-implementation-version))
(error "Cannot cross compile as the target ECL version ~a does not match the host ECL version ~a"
*target-lisp-implementation-version* (lisp-implementation-version)))
(let* ((features-to-match '(#-unicode :unicode #-clos :clos
#-dlopen :dlopen))
(let* ((features-to-match '(#-unicode :unicode #-clos :clos))
(missing-features (intersection features-to-match *features*)))
(unless (null missing-features)
(warn "Cross compiling to a target with ~{~#[~;~(~a~)~;~(~a~) and ~(~a~)~:;~@{~(~a~)~#[~; and ~:;, ~]~}~]~} support from a host ECL which doesn't include these features is unsupported. Please use a host with matching feature set."
(substitute "shared library" :dlopen missing-features))))
missing-features)))
(multiple-value-prog1 (let ((*cross-compiling* t))
(funcall closure))
(let ((features (find '*features* target-info :key #'car)))