me
/
guix
Archived
1
0
Fork 0
Code

gnu: rust: Use %gcc-search-paths. 

* gnu/packages/rust.scm (rust-1.55)[native-search-paths]: Replace list
with factorized %gcc-search-paths.

Change-Id: I0052aa748d45b2302e86589e0e9bfe1ddc0c6aa3
master
Efraim Flashner 2024-01-12 12:55:51 +02:00
parent 80fffdcd9c
commit f3b13d4e0e
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/rust.scm
View File

@ -57,6 +57,7 @@
#:use-module (guix build-system cargo) #:use-module (guix build-system cargo)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix search-paths)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix memoization) #:use-module (guix memoization)
#:use-module (guix git-download) #:use-module (guix git-download)
@ -508,18 +509,8 @@ ar = \"" binutils "/bin/ar" "\"
`(("llvm" ,llvm-13) `(("llvm" ,llvm-13)
("openssl" ,openssl))) ("openssl" ,openssl)))
;; rustc invokes gcc, so we need to set its search paths accordingly. ;; rustc invokes gcc, so we need to set its search paths accordingly.
;; Note: duplicate its value here to cope with circular dependencies among
;; modules (see <https://bugs.gnu.org/31392>).
(native-search-paths (native-search-paths
(list (search-path-specification %gcc-search-paths)
(variable "C_INCLUDE_PATH")
(files '("include")))
(search-path-specification
(variable "CPLUS_INCLUDE_PATH")
(files '("include/c++" "include")))
(search-path-specification
(variable "LIBRARY_PATH")
(files '("lib" "lib64")))))
(supported-systems (delete "i586-gnu" %supported-systems)) (supported-systems (delete "i586-gnu" %supported-systems))
(synopsis "Compiler for the Rust programming language") (synopsis "Compiler for the Rust programming language")
(description "Rust is a systems programming language that provides memory (description "Rust is a systems programming language that provides memory