ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: rust@1.23.0: Bootstrap from rust@1.22.0.

Browse source 
* gnu/packages/rust.scm (rust-1.23): Bootstrap from rust@1.22.0.
This commit is contained in:
Danny Milosavljevic 2018-09-24 00:40:58 +02:00
parent a75b8c08c0
commit 44d530ef09
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gnu/packages/rust.scm
View file

@ -657,28 +657,22 @@ (define-public rust-1.22
"1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb")) "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb"))
(define-public rust-1.23 (define-public rust-1.23
(package (let ((base-rust (rust-bootstrapped-package rust-1.22 "1.23.0"
(inherit rust-1.22) "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")))
(name "rust") (package
(version "1.23.0") (inherit base-rust)
(source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) (arguments
;; Use rust-bootstrap@1.22 package to build rust 1.23 (substitute-keyword-arguments (package-arguments base-rust)
(native-inputs ((#:phases phases)
(alist-replace "cargo-bootstrap" (list rust-bootstrap "cargo") `(modify-phases ,phases
(alist-replace "rustc-bootstrap" (list rust-bootstrap) (delete 'configure-archiver)
(package-native-inputs rust-1.22)))) (delete 'remove-ar)
(arguments (add-after 'unpack 'dont-build-native
(substitute-keyword-arguments (package-arguments rust-1.22) (lambda _
((#:phases phases) ;; XXX: Revisit this when we use gcc 6.
`(modify-phases ,phases (substitute* "src/binaryen/CMakeLists.txt"
(delete 'configure-archiver) (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") ""))
(delete 'remove-ar) #t)))))))))
(add-after 'unpack 'dont-build-native
(lambda _
;; XXX: Revisit this when we use gcc 6.
(substitute* "src/binaryen/CMakeLists.txt"
(("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") ""))
#t))))))))
(define-public rust-1.24 (define-public rust-1.24
(let ((base-rust (let ((base-rust