guix-commits
[Top][All Lists]
Advanced

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

02/05: gnu: mergerfs: Cross-compile.


From: guix-commits
Subject: 02/05: gnu: mergerfs: Cross-compile.
Date: Thu, 8 Jul 2021 23:16:51 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 5f071925ef26493582ee78a6a37d6a8e2d033bc4
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Jul 9 02:48:34 2021 +0200

    gnu: mergerfs: Cross-compile.
    
    * gnu/packages/file-systems.scm (mergerfs)[arguments]: Use CC-FOR-TARGET
    and CXX-FOR-TARGET.  Don't let the Makefile strip binaries.
---
 gnu/packages/file-systems.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index c3eacea..c6773cc 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1388,7 +1388,10 @@ On Guix System, you will need to invoke the included 
shell scripts as
         (base32 "08gwi094ll0b7nf2i44fyjxiyvr45rp766npbdyw0yzyigas8a2f"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ; No tests exist.
+     `(#:make-flags
+       (list (string-append "CC=" ,(cc-for-target))
+             (string-append "CXX=" ,(cxx-for-target)))
+       #:tests? #f                      ; No tests exist.
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
@@ -1408,7 +1411,9 @@ On Guix System, you will need to invoke the included 
shell scripts as
                (("= /usr/local") (string-append "= " (assoc-ref outputs 
"out")))
                (("= /sbin") "= $(EXEC_PREFIX)/sbin")
                ;; cannot chown as build user
-               (("chown root(:root)?") "true"))
+               (("chown root(:root)?") "true")
+               ;; Breaks cross-compilation.
+               (("strip") "true"))
              #t)))))
     ;; mergerfs bundles a heavily modified copy of libfuse.
     (inputs `(("util-linux" ,util-linux)))



reply via email to

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