gnu: qemu-minimal: Use 'match' to find architecture.
* gnu/packages/virtualization.scm (qemu-minimal)[arguments]: Use 'match' to target the correct architecture.
This commit is contained in:
parent
e39b857d74
commit
a7e6ec18d7
1 changed files with 28 additions and 28 deletions
|
@ -312,34 +312,34 @@ server and embedded PowerPC, and S390 guests.")
|
||||||
(substitute-keyword-arguments (package-arguments qemu)
|
(substitute-keyword-arguments (package-arguments qemu)
|
||||||
((#:configure-flags _ '(list))
|
((#:configure-flags _ '(list))
|
||||||
;; Restrict to the host's architecture.
|
;; Restrict to the host's architecture.
|
||||||
(let ((arch (car (string-split (or (%current-target-system)
|
(match (car (string-split (or (%current-target-system)
|
||||||
(%current-system))
|
(%current-system))
|
||||||
#\-))))
|
#\-))
|
||||||
(cond ((string=? arch "i686")
|
("i686"
|
||||||
'(list "--target-list=i386-softmmu"))
|
'(list "--target-list=i386-softmmu"))
|
||||||
((string-prefix? "x86_64" arch)
|
("x86_64"
|
||||||
'(list "--target-list=i386-softmmu,x86_64-softmmu"))
|
'(list "--target-list=i386-softmmu,x86_64-softmmu"))
|
||||||
((string-prefix? "mips64" arch)
|
("mips64"
|
||||||
'(list (string-append "--target-list=mips-softmmu,mipsel-softmmu,"
|
'(list (string-append "--target-list=mips-softmmu,mipsel-softmmu,"
|
||||||
"mips64-softmmu,mips64el-softmmu")))
|
"mips64-softmmu,mips64el-softmmu")))
|
||||||
((string-prefix? "mips" arch)
|
("mips"
|
||||||
'(list "--target-list=mips-softmmu,mipsel-softmmu"))
|
'(list "--target-list=mips-softmmu,mipsel-softmmu"))
|
||||||
((string-prefix? "aarch64" arch)
|
("aarch64"
|
||||||
'(list "--target-list=arm-softmmu,aarch64-softmmu"))
|
'(list "--target-list=arm-softmmu,aarch64-softmmu"))
|
||||||
((string-prefix? "arm" arch)
|
("arm"
|
||||||
'(list "--target-list=arm-softmmu"))
|
'(list "--target-list=arm-softmmu"))
|
||||||
((string-prefix? "alpha" arch)
|
("alpha"
|
||||||
'(list "--target-list=alpha-softmmu"))
|
'(list "--target-list=alpha-softmmu"))
|
||||||
((string-prefix? "powerpc64" arch)
|
("powerpc64"
|
||||||
'(list "--target-list=ppc-softmmu,ppc64-softmmu"))
|
'(list "--target-list=ppc-softmmu,ppc64-softmmu"))
|
||||||
((string-prefix? "powerpc" arch)
|
("powerpc"
|
||||||
'(list "--target-list=ppc-softmmu"))
|
'(list "--target-list=ppc-softmmu"))
|
||||||
((string-prefix? "s390" arch)
|
("s390"
|
||||||
'(list "--target-list=s390x-softmmu"))
|
'(list "--target-list=s390x-softmmu"))
|
||||||
((string-prefix? "riscv" arch)
|
("riscv"
|
||||||
'(list "--target-list=riscv32-softmmu,riscv64-softmmu"))
|
'(list "--target-list=riscv32-softmmu,riscv64-softmmu"))
|
||||||
(else ; An empty list actually builds all the targets.
|
(else ; An empty list actually builds all the targets.
|
||||||
''()))))))
|
''())))))
|
||||||
|
|
||||||
;; Remove dependencies on optional libraries, notably GUI libraries.
|
;; Remove dependencies on optional libraries, notably GUI libraries.
|
||||||
(native-inputs (fold alist-delete (package-native-inputs qemu)
|
(native-inputs (fold alist-delete (package-native-inputs qemu)
|
||||||
|
|
Reference in a new issue