Merge branch 'fix-compcert' into 'master'

nongnu: compcert: Fix a non-exhaustive match.

See merge request nonguix/nonguix!22
This commit is contained in:
Alex Griffin 2020-04-11 22:48:05 +00:00
commit 40b62f7aaf

View file

@ -43,9 +43,9 @@
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((system ,(match (or (%current-target-system) (%current-system)) (let ((system ,(match (or (%current-target-system) (%current-system))
("x86_64-linux" "x86_64-linux") ("armhf-linux" "arm-eabihf")
("i686-linux" "x86_32-linux") ("i686-linux" "x86_32-linux")
("armhf-linux" "arm-linux")))) (s s))))
(format #t "Building for ~a~%" system) (format #t "Building for ~a~%" system)
(invoke "./configure" system "-prefix" (invoke "./configure" system "-prefix"
(assoc-ref outputs "out"))) (assoc-ref outputs "out")))
@ -62,6 +62,8 @@
(find-files "." ".*.vo$")) (find-files "." ".*.vo$"))
#t))) #t)))
#:tests? #f)) #:tests? #f))
;; MIPS is not supported.
(supported-systems (delete "mips64el-linux" %supported-systems))
(native-inputs (native-inputs
`(("ocaml" ,ocaml) `(("ocaml" ,ocaml)
("ocaml-findlib" ,ocaml-findlib); for menhir --suggest-menhirlib ("ocaml-findlib" ,ocaml-findlib); for menhir --suggest-menhirlib