diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-10-23 21:09:49 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-10-23 21:09:49 +0200 |
| commit | e38d6a9c2fba815ac34e74baa843f15e33846813 (patch) | |
| tree | 0a3dd602449386119fc15de32a5cf7e5f607b2a1 /gnu/packages/nss.scm | |
| parent | da716c8b9cdc358609a368bd5da70b31cd97a938 (diff) | |
| parent | cbd20d627497053871db863970c07d93c7081786 (diff) | |
Merge branch 'master' into gnome-team
Change-Id: Ib6f55bebef2fb235fa59fd5442102a3e0ace3191
Diffstat (limited to 'gnu/packages/nss.scm')
| -rw-r--r-- | gnu/packages/nss.scm | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 640eb5b2e4..54b9e5041a 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -143,6 +143,17 @@ in the Mozilla clients.") #$@(if (target-riscv64?) #~("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=" (search-input-directory %build-inputs "include/nspr")) @@ -163,6 +174,10 @@ in the Mozilla clients.") (replace 'configure (lambda _ (setenv "CC" #$(cc-for-target)) + ;; TODO: Set this unconditionally + #$@(if (%current-target-system) + #~((setenv "CCC" #$(cxx-for-target))) + #~()) ;; No VSX on powerpc-linux. #$@(if (target-ppc32?) #~((setenv "NSS_DISABLE_CRYPTO_VSX" "1")) |