From 1173263cc9b942683fd583df77c4659da48eb47a Mon Sep 17 00:00:00 2001 From: Gary Palter <palter@clozure.com> Date: Fri, 23 Apr 2021 15:35:30 -0400 Subject: [PATCH] Fix Genera's special case to skip /usr/share/common-lisp OS-COND evaluates its clauses at compile time and only includes the relevant clause. Change the clause in XDG-DATA-DIRS for Genera to check whether we're on a VLM running on macOS at runtime. Otherwise, the binary we distribute with Genera will either include /usr/share/common-lisp or it won't depending on which machine I use to compile. --- uiop/configuration.lisp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/uiop/configuration.lisp b/uiop/configuration.lisp index 4c6b315a4..0e9a5a154 100644 --- a/uiop/configuration.lisp +++ b/uiop/configuration.lisp @@ -328,11 +328,10 @@ also \"Configuration DSL\"\) in the ASDF manual." ;; to export either the root (/) or /usr/share simply doesn't work. ;; (Genera will go into an infinite loop trying to access those mounts.) ;; So, when running Genera on macOS, only search /usr/local/share. - ((and (os-genera-p) - #+Genera (sys:system-case - (darwin-vlm t) - (otherwise nil))) - (mapcar 'parse-unix-namestring '("/usr/local/share/"))) + ((os-genera-p) + #+Genera (sys:system-case + (darwin-vlm (mapcar 'parse-unix-namestring '("/usr/local/share/"))) + (otherwise (mapcar 'parse-unix-namestring '("/usr/local/share/" "/usr/share/"))))) (t (mapcar 'parse-unix-namestring '("/usr/local/share/" "/usr/share/"))))))) (defun xdg-config-dirs (&rest more) -- GitLab