0.6.11.37:

[sbcl.git] / src / code / linux-os.lisp

diff --git a/src/code/linux-os.lisp b/src/code/linux-os.lisp
index 8d7abc0..50ae48e 100644 (file)
--- a/src/code/linux-os.lisp
+++ b/src/code/linux-os.lisp
@@ -11,10 +11,8 @@
 
 (in-package "SB!SYS")
 
-(file-comment
-  "$Header$")
-
-;;; Check that target machine features are set up consistently with this file.
+;;; Check that target machine features are set up consistently with
+;;; this file.
 #!-linux (error "missing :LINUX feature")
 
 (defun software-type ()
@@ -22,20 +20,18 @@
   "Return a string describing the supporting software."
   (values "Linux"))
 
+(defvar *software-version* nil)
+
 (defun software-version ()
   #!+sb-doc
   "Return a string describing version of the supporting software, or NIL
   if not available."
-  ;; The old CMU CL code is NILed out here. If we wanted to do this, we should
-  ;; probably either use "/bin/uname -r", but since in any case we don't have
-  ;; RUN-PROGRAM working right now (sbcl-0.6.4), for now we just punt,
-  ;; returning NIL.
-  #+nil
-  (string-trim '(#\newline)
-              (with-output-to-string (stream)
-                (run-program "/usr/cs/etc/version" ; Site dependent???
-                             nil :output stream)))
-  nil)
+  (or *software-version*
+      (setf *software-version*
+           (string-trim '(#\newline)
+                        (with-output-to-string (stream)
+                          (sb!ext:run-program "/bin/uname" `("-r")
+                                              :output stream))))))
 
 ;;; OS-COLD-INIT-OR-REINIT initializes our operating-system interface.
 ;;; It sets the values of the global port variables to what they