nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: rust: Move "cc" from rust-bootstrap to rust proper. 

* gnu/packages/rust.scm (rust-bootstrap)[arguments]<#:phases>[install]:
Delete "cc".
(rust-1.23)[arguments]<#:phases>: Delete "provide-cc" deletion.
This commit is contained in:
Danny Milosavljevic 2018-09-13 00:37:15 +02:00
parent 333c0ca966
commit bfdc0e4d45
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/rust.scm
View File

@ -143,11 +143,6 @@
(for-each (lambda (file) (for-each (lambda (file)
(invoke "patchelf" "--set-interpreter" ld-so file)) (invoke "patchelf" "--set-interpreter" ld-so file))
(list rustc rustdoc cargo)) (list rustc rustdoc cargo))
;; Rust requires a C toolchain for linking. The prebuilt
;; binaries expect a compiler called cc. Thus symlink gcc
;; to cc.
(symlink (string-append gcc "/bin/gcc")
(string-append out "/bin/cc"))
#t)))))) #t))))))
(home-page "https://www.rust-lang.org") (home-page "https://www.rust-lang.org")
(synopsis "Prebuilt rust compiler and cargo package manager") (synopsis "Prebuilt rust compiler and cargo package manager")
@ -636,7 +631,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(substitute-keyword-arguments (package-arguments rust-1.20) (substitute-keyword-arguments (package-arguments rust-1.20)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(delete 'provide-cc)
(delete 'configure-archiver) (delete 'configure-archiver)
(add-after 'unpack 'dont-build-native (add-after 'unpack 'dont-build-native
(lambda _ (lambda _