aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-02-24 23:00:29 +0100
committerLudovic Courtès <ludo@gnu.org>2015-02-24 23:43:03 +0100
commit43da8f018d5835b62e8f5f1f4e2cc701f828a3db (patch)
tree8663c8bb5af0408e287f3caf479d582712cdeb55
parent9ffee4571c0bf645ffeba2442a0065fb224d9765 (diff)
downloadguix-43da8f018d5835b62e8f5f1f4e2cc701f828a3db.tar
guix-43da8f018d5835b62e8f5f1f4e2cc701f828a3db.tar.gz
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.
-rw-r--r--build-aux/check-available-binaries.scm47
-rw-r--r--build-aux/check-final-inputs-self-contained.scm7
2 files changed, 28 insertions, 26 deletions
diff --git a/build-aux/check-available-binaries.scm b/build-aux/check-available-binaries.scm
index 7ac4352839..bc6207eb2a 100644
--- a/build-aux/check-available-binaries.scm
+++ b/build-aux/check-available-binaries.scm
@@ -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)))))
diff --git a/build-aux/check-final-inputs-self-contained.scm b/build-aux/check-final-inputs-self-contained.scm
index ca7e8030b4..ba85c876d2 100644
--- a/build-aux/check-final-inputs-self-contained.scm
+++ b/build-aux/check-final-inputs-self-contained.scm
@@ -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)))