guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

17/17: gnu: pzstd: Cross compile.


From: guix-commits
Subject: 17/17: gnu: pzstd: Cross compile.
Date: Mon, 16 Nov 2020 08:12:41 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 455daf46adadf47582f57ff2ec8898b927913793
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Nov 16 15:10:30 2020 +0200

    gnu: pzstd: Cross compile.
    
    * gnu/packages/compression.scm (pzstd)[arguments]: use cc-for-target,
    cxx-for-target in make-flags.
    [native-inputs]: Only use googletest when compiling natively.
    [inputs]: Add googletest when cross compiling.
---
 gnu/packages/compression.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index e7993f2..c19946f 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1461,8 +1461,14 @@ speed.")
     (version (package-version zstd))
     (source (package-source zstd))
     (build-system gnu-build-system)
+    (inputs
+     `(,@(if (%current-target-system)
+           `(("googletest" ,googletest))
+           '())))
     (native-inputs
-     `(("googletest" ,googletest)))
+     `(,@(if (%current-system)
+           `(("googletest" ,googletest))
+           '())))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1480,7 +1486,8 @@ speed.")
                (install-file "README.md" doc)
                #t))))
        #:make-flags
-       (list "CC=gcc"
+       (list (string-append "CC=" ,(cc-for-target))
+             (string-append "CXX=" ,(cxx-for-target))
              (string-append "PREFIX=" (assoc-ref %outputs "out")))))
     (home-page (package-home-page zstd))
     (synopsis "Threaded implementation of the Zstandard compression algorithm")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]