summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2024-01-12 12:55:51 +0200
committerEfraim Flashner <efraim@flashner.co.il>2024-02-20 13:57:41 +0200
commitf3b13d4e0e19ffa7bc9ef4de6df2059479e99156 (patch)
tree4e4ff3c3d4158d0d223255cddc4f2417afc2c10a
parent80fffdcd9cbb0bfe6819fec443f082fdcb4abf44 (diff)
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
-rw-r--r--gnu/packages/rust.scm13
1 files changed, 2 insertions, 11 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index dbc16a02ab8..b873437458b 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -57,6 +57,7 @@
57 #:use-module (guix build-system cargo) 57 #:use-module (guix build-system cargo)
58 #:use-module (guix build-system gnu) 58 #:use-module (guix build-system gnu)
59 #:use-module (guix build-system trivial) 59 #:use-module (guix build-system trivial)
60 #:use-module (guix search-paths)
60 #:use-module (guix download) 61 #:use-module (guix download)
61 #:use-module (guix memoization) 62 #:use-module (guix memoization)
62 #:use-module (guix git-download) 63 #:use-module (guix git-download)
@@ -508,18 +509,8 @@ ar = \"" binutils "/bin/ar" "\"
508 `(("llvm" ,llvm-13) 509 `(("llvm" ,llvm-13)
509 ("openssl" ,openssl))) 510 ("openssl" ,openssl)))
510 ;; rustc invokes gcc, so we need to set its search paths accordingly. 511 ;; rustc invokes gcc, so we need to set its search paths accordingly.
511 ;; Note: duplicate its value here to cope with circular dependencies among
512 ;; modules (see <https://bugs.gnu.org/31392>).
513 (native-search-paths 512 (native-search-paths
514 (list (search-path-specification 513 %gcc-search-paths)
515 (variable "C_INCLUDE_PATH")
516 (files '("include")))
517 (search-path-specification
518 (variable "CPLUS_INCLUDE_PATH")
519 (files '("include/c++" "include")))
520 (search-path-specification
521 (variable "LIBRARY_PATH")
522 (files '("lib" "lib64")))))
523 (supported-systems (delete "i586-gnu" %supported-systems)) 514 (supported-systems (delete "i586-gnu" %supported-systems))
524 (synopsis "Compiler for the Rust programming language") 515 (synopsis "Compiler for the Rust programming language")
525 (description "Rust is a systems programming language that provides memory 516 (description "Rust is a systems programming language that provides memory