Subject: [bug#70509] [PATCH 2/2] gnu: nss: Fix cross-compilation.

From: Zheng Junjie <[email-masked]>
Date: Mon, 22 Apr 2024 13:29:17 +0800

* 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
---
 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 @@ (define-public nss
                                             (#$(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 @@ (define-public nss
               (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?)
-- 
2.41.0