Merged

clasp-developers · Jun 20, 2024 · 97701ee · 97701ee
2 parents 8cd97de + cb4e391
commit 97701ee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/koga/ninja.lisp b/src/koga/ninja.lisp
@@ -220,6 +220,7 @@
      &aux (identifiers (make-source ".identifiers" :code))
           (outputs (list (make-source "TAGS" :code))))
   (when (and *variant-default*
+             (not (reproducible-build configuration))
              (or (etags configuration)
                  (ctags configuration)))
     (ninja:write-build output-stream :tags
@@ -417,6 +418,7 @@
                                      (when (member :cando (extensions configuration))
                                        (list cleap-symlink))
                                      (when (and *variant-default*
+                                                (not (reproducible-build configuration))
                                                 (or (etags configuration)
                                                     (ctags configuration)))
                                        (list "tags")))

diff --git a/src/koga/units.lisp b/src/koga/units.lisp
@@ -157,18 +157,20 @@
 
 (defmethod configure-unit (configuration (unit (eql :etags)))
   "Find the etags binary."
-  (with-accessors ((etags etags))
-      configuration
-    (message :emph "Configuring etags")
-    (setf etags (configure-program "etags"
-                                   (or etags (list #P"etags"))))))
+  (unless (reproducible-build configuration)
+    (with-accessors ((etags etags))
+        configuration
+      (message :emph "Configuring etags")
+      (setf etags (configure-program "etags"
+                                     (or etags (list #P"etags")))))))
 
 (defmethod configure-unit (configuration (unit (eql :ctags)))
   "Find the ctags binary."
-  (with-accessors ((ctags ctags))
-      configuration
-    (message :emph "Configuring ctags")
-    (setf ctags (configure-program "ctags" ctags :match "Ctags"))))
+  (unless (reproducible-build configuration)
+    (with-accessors ((ctags ctags))
+        configuration
+      (message :emph "Configuring ctags")
+      (setf ctags (configure-program "ctags" ctags :match "Ctags")))))
 
 (defmethod configure-unit (configuration (unit (eql :xcode))
                            &aux (env (uiop:getenv-absolute-directory "XCODE_SDK"))

diff --git a/src/lisp/kernel/clos/conditions.lisp b/src/lisp/kernel/clos/conditions.lisp
@@ -579,7 +579,7 @@ returns with NIL."
   ((address :initarg :address :reader memory-condition-address))
   (:REPORT
    (lambda (condition stream)
-     (format stream "Segmentation fault. Attempted to access resticted memory address #x~x.
+     (format stream "Segmentation fault. Attempted to access restricted memory address #x~x.
 
 This is due either to a problem in foreign code (e.g., C++), or a bug in Clasp itself."
              (memory-condition-address condition)))))