aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZheng Junjie <zhengjunjie@iscas.ac.cn>2024-04-22 13:29:17 +0800
committerZheng Junjie <zhengjunjie@iscas.ac.cn>2024-04-24 09:43:06 +0800
commitfb86bf658a9374d41b05c5e586bfc6a3150cc3cb (patch)
treeb8c171d560c959cee2368263cb683d82fbe1c318
parent452e7673bfeb0a14cecb8e760dda2c436aa69047 (diff)
downloadguix-fb86bf658a9374d41b05c5e586bfc6a3150cc3cb.tar
guix-fb86bf658a9374d41b05c5e586bfc6a3150cc3cb.tar.gz
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>
-rw-r--r--gnu/packages/nss.scm6
1 files changed, 5 insertions, 1 deletions
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?)