Browse Source

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.
gn-latest-20200428
Ludovic Courtès 5 years ago
parent
commit
43da8f018d
2 changed files with 28 additions and 26 deletions
  1. +24
    -23
      build-aux/check-available-binaries.scm
  2. +4
    -3
      build-aux/check-final-inputs-self-contained.scm

+ 24
- 23
build-aux/check-available-binaries.scm View File

@@ -29,27 +29,28 @@
(srfi srfi-26))

(with-store store
(let* ((native (append-map (lambda (system)
(map (cut package-derivation store <> system)
(list %bootstrap-tarballs emacs)))
%supported-systems))
(cross (map (cut package-cross-derivation store
%bootstrap-tarballs <>)
'("mips64el-linux-gnuabi64")))
(total (append native cross)))
(define (warn item system)
(format (current-error-port) "~a (~a) is not substitutable~%"
item system)
#f)
(parameterize ((%graft? #f))
(let* ((native (append-map (lambda (system)
(map (cut package-derivation store <> system)
(list %bootstrap-tarballs emacs)))
%supported-systems))
(cross (map (cut package-cross-derivation store
%bootstrap-tarballs <>)
'("mips64el-linux-gnuabi64")))
(total (append native cross)))
(define (warn item system)
(format (current-error-port) "~a (~a) is not substitutable~%"
item system)
#f)

(set-build-options store #:use-substitutes? #t)
(let* ((substitutable? (substitution-oracle store total))
(result (every (lambda (drv)
(let ((out (derivation->output-path drv)))
(or (substitutable? out)
(warn out (derivation-system drv)))))
total)))
(when result
(format (current-error-port) "~a packages found substitutable~%"
(length total)))
(exit result))))
(set-build-options store #:use-substitutes? #t)
(let* ((substitutable? (substitution-oracle store total))
(result (every (lambda (drv)
(let ((out (derivation->output-path drv)))
(or (substitutable? out)
(warn out (derivation-system drv)))))
total)))
(when result
(format (current-error-port) "~a packages found substitutable~%"
(length total)))
(exit result)))))

+ 4
- 3
build-aux/check-final-inputs-self-contained.scm View File

@@ -73,8 +73,9 @@ refer to the bootstrap tools."

;; Entry point.
(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 <>)
%supported-systems))
(for-each (cut test-final-inputs store <>)
%supported-systems)))


Loading…
Cancel
Save