futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: nss: Fix cross-compiling.

Browse Source 
* gnu/packages/nss.scm (nss)[arguments]: Adjust configure-flags when
cross-compiling to correctly set the target architecture and kernel.
Adjust the custom 'configure-phase when cross-compiling to use the
correct C++ compiler.
This commit is contained in:
Efraim Flashner 2023-10-15 13:02:26 +03:00
parent 2aab62fe24
commit a888342f89
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/nss.scm
View File

@ -143,6 +143,17 @@ in the Mozilla clients.")
#$@(if (target-riscv64?) #$@(if (target-riscv64?)
#~("NSS_DISABLE_GTESTS=1") #~("NSS_DISABLE_GTESTS=1")
#~()) #~())
;; Ensure we are building for the (%current-target-system).
#$@(if (%current-target-system)
#~((string-append
"OS_TEST="
(string-take #$(%current-target-system)
(string-index #$(%current-target-system) #\-)))
(string-append
"KERNEL=" (cond (#$(target-hurd?) "gnu")
(#$(target-linux?) "linux")
(else ""))))
#~())
(string-append "NSPR_INCLUDE_DIR=" (string-append "NSPR_INCLUDE_DIR="
(search-input-directory %build-inputs (search-input-directory %build-inputs
"include/nspr")) "include/nspr"))
@ -163,6 +174,10 @@ in the Mozilla clients.")
(replace 'configure (replace 'configure
(lambda _ (lambda _
(setenv "CC" #$(cc-for-target)) (setenv "CC" #$(cc-for-target))
;; TODO: Set this unconditionally
#$@(if (%current-target-system)
#~((setenv "CCC" #$(cxx-for-target)))
#~())
;; No VSX on powerpc-linux. ;; No VSX on powerpc-linux.
#$@(if (target-ppc32?) #$@(if (target-ppc32?)
#~((setenv "NSS_DISABLE_CRYPTO_VSX" "1")) #~((setenv "NSS_DISABLE_CRYPTO_VSX" "1"))