[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/05: gnu: nss: Fix cross-compilation.
From: |
guix-commits |
Subject: |
03/05: gnu: nss: Fix cross-compilation. |
Date: |
Tue, 23 Apr 2024 22:26:12 -0400 (EDT) |
z572 pushed a commit to branch master
in repository guix.
commit fb86bf658a9374d41b05c5e586bfc6a3150cc3cb
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Mon Apr 22 13:29:17 2024 +0800
gnu: nss: Fix cross-compilation.
* gnu/packages/nss.scm (nss)[arguments]<#:make-flags>: When
cross-compilation, Add CROSS_COMPILE=1.
<#:phases>: When cross-compilation, Set env NATIVE_CC to gcc.
Change-Id: I5c9559a4b8cecf2cfc6c47d136d69c01a335faaf
Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn>
---
gnu/packages/nss.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index a93406b9eb..00770f11a9 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -157,6 +157,9 @@ in the Mozilla clients.")
(#$(target-linux?) "linux")
(else ""))))
#~())
+ #$@(if (%current-target-system)
+ #~("CROSS_COMPILE=1")
+ #~())
(string-append "NSPR_INCLUDE_DIR="
(search-input-directory %build-inputs
"include/nspr"))
@@ -179,7 +182,8 @@ in the Mozilla clients.")
(setenv "CC" #$(cc-for-target))
;; TODO: Set this unconditionally
#$@(if (%current-target-system)
- #~((setenv "CCC" #$(cxx-for-target)))
+ #~((setenv "CCC" #$(cxx-for-target))
+ (setenv "NATIVE_CC" "gcc"))
#~())
;; No VSX on powerpc-linux.
#$@(if (target-ppc32?)