[PATCH] fix build with CCL on windows, again

8 views
Skip to first unread message

Qian Yun

unread,
May 13, 2024, 5:22:20 AM5/13/24
to fricas-devel
I build with CCL on windows again today, and find that my
previous fix d2d7e978d3de17cdadb184ee7c08deed182116fe
is not enough:

I think it needs to have the :win32 feature at compile time,
otherwise the reader macro will discard unused branch
when compiling |trim_directory_name|.

So I moved the code from fricas-lisp.lisp to fricas-package.lisp,
which already have a code block modifying *FEATURES*.

- Qian

diff --git a/src/lisp/fricas-lisp.lisp b/src/lisp/fricas-lisp.lisp
index be51b6fb..bf46a61a 100644
--- a/src/lisp/fricas-lisp.lisp
+++ b/src/lisp/fricas-lisp.lisp
@@ -236,9 +236,6 @@ with this hack and will try to convince the GCL
crowd to fix this.
;;; For ECL assume :unix, when :netbsd or :darwin
#+(and :ecl (or :darwin :netbsd)) (push :unix *features*)

-;;; For Clozure CL assume :win32, when :windows
-#+(and :openmcl :windows) (push :win32 *features*)
-
;;; -----------------------------------------------------------------

;;; Deleting files ignoring errors
diff --git a/src/lisp/fricas-package.lisp b/src/lisp/fricas-package.lisp
index fdc02117..279eeb30 100644
--- a/src/lisp/fricas-package.lisp
+++ b/src/lisp/fricas-package.lisp
@@ -65,6 +65,8 @@
)
#+:openmcl
(eval-when (:execute :compile-toplevel :load-toplevel)
+ ;;; For Clozure CL assume :win32, when :windows
+ #+:windows (push :win32 *features*)
(setf *features* (delete :CCL *features*)))

;;; Package containing Shoe to Lisp translator

Waldek Hebisch

unread,
May 13, 2024, 3:05:14 PM5/13/24
to fricas...@googlegroups.com
On Mon, May 13, 2024 at 05:22:15PM +0800, Qian Yun wrote:
> I build with CCL on windows again today, and find that my
> previous fix d2d7e978d3de17cdadb184ee7c08deed182116fe
> is not enough:
>
> I think it needs to have the :win32 feature at compile time,
> otherwise the reader macro will discard unused branch
> when compiling |trim_directory_name|.
>
> So I moved the code from fricas-lisp.lisp to fricas-package.lisp,
> which already have a code block modifying *FEATURES*.

OK
> --
> You received this message because you are subscribed to the Google Groups "FriCAS - computer algebra system" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to fricas-devel...@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/fricas-devel/b26f5ac2-99cc-4ba3-8008-2508eab85c7b%40gmail.com.

--
Waldek Hebisch
Reply all
Reply to author
Forward
0 new messages