02/02: gnu: rust: Do not refer to 'gcc' from the top level.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit afc2bf53066975558676bc7f4957ad85d0ec170a
Author: Ludovic Courtès <address@hidden>
Date:   Thu May 10 00:27:17 2018 +0200

    gnu: rust: Do not refer to 'gcc' from the top level.
    
    Fixes <https://bugs.gnu.org/31392>.
    Reported by Marius Bakke <address@hidden>.
    
    * gnu/packages/rust.scm (rust-1.19)[native-search-paths]: Avoid
    top-level reference to 'gcc', which could lead to unbound variable
    errors.
---
 gnu/packages/rust.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 0a9d5bb..bf50cdd 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -237,8 +237,21 @@ in turn be used to build the final Rust.")
        ("llvm" ,llvm-3.9.1)
        ("openssl" ,openssl)
        ("libcurl" ,curl))) ; For "cargo"
+
     ;; rustc invokes gcc, so we need to set its search paths accordingly.
-    (native-search-paths (package-native-search-paths gcc))
+    ;; Note: duplicate its value here to cope with circular dependencies among
+    ;; modules (see <https://bugs.gnu.org/31392>).
+    (native-search-paths
+     (list (search-path-specification
+            (variable "C_INCLUDE_PATH")
+            (files '("include")))
+           (search-path-specification
+            (variable "CPLUS_INCLUDE_PATH")
+            (files '("include")))
+           (search-path-specification
+            (variable "LIBRARY_PATH")
+            (files '("lib" "lib64")))))
+
     (synopsis "Compiler for the Rust progamming language")
     (description "Rust is a systems programming language that provides memory
 safety and thread safety guarantees.")