diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-08 19:05:56 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-08 19:05:56 +0200 |
| commit | dd2d3ed2d30b5d705f9ed8695ab3171c29469f76 (patch) | |
| tree | 22e909cfe9de99fab471621a907b9f87045bb3bd /gnu/build/vm.scm | |
| parent | 24b61fb8ea8a9e8c5320d1db1447f9b62ad04b3d (diff) | |
| parent | 1fd2c00efbe701a81d86c254d5f4f285e63c1cde (diff) | |
| download | guix-patches-dd2d3ed2d30b5d705f9ed8695ab3171c29469f76.tar guix-patches-dd2d3ed2d30b5d705f9ed8695ab3171c29469f76.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/build/vm.scm')
| -rw-r--r-- | gnu/build/vm.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 433b5a7e8d..0f0ceae18f 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -84,8 +84,6 @@ linux initrd make-disk-image? single-file-output? - target-arm32? - target-aarch64? (disk-image-size (* 100 (expt 2 20))) (disk-image-format "qcow2") (references-graphs '())) @@ -101,7 +99,14 @@ access it via /dev/hda. REFERENCES-GRAPHS can specify a list of reference-graph files as produced by the #:references-graphs parameter of 'derivation'." - (define target-arm? (or target-arm32? target-aarch64?)) + (define target-arm32? + (string-prefix? "arm-" %host-type)) + + (define target-aarch64? + (string-prefix? "aarch64-" %host-type)) + + (define target-arm? + (or target-arm32? target-aarch64?)) (define arch-specific-flags `(;; On ARM, a machine has to be specified. Use "virt" machine to avoid |