Skip to content
Snippets Groups Projects
Commit 43da8f01 authored by Ludovic Courtès's avatar Ludovic Courtès
Browse files

build: Disable grafting in sanity checks.

* build-aux/check-available-binaries.scm: Wrap body in 'parameterize'
  form that clears '%graft?'.
* build-aux/check-final-inputs-self-contained.scm: Likewise.
parent 9ffee457
No related branches found
No related tags found
No related merge requests found
...@@ -29,27 +29,28 @@ ...@@ -29,27 +29,28 @@
(srfi srfi-26)) (srfi srfi-26))
(with-store store (with-store store
(let* ((native (append-map (lambda (system) (parameterize ((%graft? #f))
(map (cut package-derivation store <> system) (let* ((native (append-map (lambda (system)
(list %bootstrap-tarballs emacs))) (map (cut package-derivation store <> system)
%supported-systems)) (list %bootstrap-tarballs emacs)))
(cross (map (cut package-cross-derivation store %supported-systems))
%bootstrap-tarballs <>) (cross (map (cut package-cross-derivation store
'("mips64el-linux-gnuabi64"))) %bootstrap-tarballs <>)
(total (append native cross))) '("mips64el-linux-gnuabi64")))
(define (warn item system) (total (append native cross)))
(format (current-error-port) "~a (~a) is not substitutable~%" (define (warn item system)
item system) (format (current-error-port) "~a (~a) is not substitutable~%"
#f) item system)
#f)
(set-build-options store #:use-substitutes? #t) (set-build-options store #:use-substitutes? #t)
(let* ((substitutable? (substitution-oracle store total)) (let* ((substitutable? (substitution-oracle store total))
(result (every (lambda (drv) (result (every (lambda (drv)
(let ((out (derivation->output-path drv))) (let ((out (derivation->output-path drv)))
(or (substitutable? out) (or (substitutable? out)
(warn out (derivation-system drv))))) (warn out (derivation-system drv)))))
total))) total)))
(when result (when result
(format (current-error-port) "~a packages found substitutable~%" (format (current-error-port) "~a packages found substitutable~%"
(length total))) (length total)))
(exit result)))) (exit result)))))
...@@ -73,8 +73,9 @@ (define (test-final-inputs store system) ...@@ -73,8 +73,9 @@ (define (test-final-inputs store system)
;; Entry point. ;; Entry point.
(with-store store (with-store store
(set-build-options store #:use-substitutes? #t) (parameterize ((%graft? #f))
(set-build-options store #:use-substitutes? #t)
(for-each (cut test-final-inputs store <>) (for-each (cut test-final-inputs store <>)
%supported-systems)) %supported-systems)))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment