X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/77f935dafbb63f1674a3df832972fda67c10e3d6..209dc75acf6ca1b236324bbad404070a88f99851:/sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index 4f52ec8..4a90b93 100644
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -39,11 +39,16 @@
 (defun set-command-line-arguments ()
   (setf *command-line*
 	(or (when (member :cl-launch *features*)
-	      (let* ((cll-package (find-package :cl-launch))
-		     (name (funcall (intern "GETENV" cll-package)
-				    "CL_LAUNCH_FILE"))
-		     (args (symbol-value (intern "*ARGUMENTS*"
-						 cll-package))))
+	      (let* ((uiop-package (find-package :uiop))
+		     (cll-package (find-package :cl-launch))
+		     (name (some (intern "GETENV"
+					 (or uiop-package cll-package))
+				 (list "__CL_ARGV0" "CL_LAUNCH_FILE")))
+		     (args (symbol-value
+			    (if uiop-package
+				(intern "*COMMAND-LINE-ARGUMENTS*"
+					uiop-package)
+				(intern "*ARGUMENTS*" cll-package)))))
 		(if name
 		    (cons name args)
 		    args)))