02/08: build-system: Pass #:make-dynamic-linker-cache? #f when cross-compiling.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 6128c274786fc0c109c0c4ce257e5d8b01ac86c3
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Jan 11 11:31:39 2022 +0100

    build-system: Pass #:make-dynamic-linker-cache? #f when cross-compiling.
    
    Fixes <https://issues.guix.gnu.org/52898>.
    Reported by Maxime Devos <maximedevos@telenet.be>.
    
    This is a followup to 1209447ad3f471d12e9408dd478b3cfcd7b7a07e.
    
    * guix/build-system/cmake.scm (cmake-cross-build)[builder]: Pass
      #:make-dynamic-linker-cache? #f.
    * guix/build-system/go.scm (go-cross-build)[builder]: Ditto.
    * guix/build-system/guile.scm (guile-cross-build)[builder]: Ditto.
    * guix/build-system/qt.scm (qt-cross-build)[builder]: Ditto.
---
 guix/build-system/cmake.scm | 3 ++-
 guix/build-system/go.scm    | 3 ++-
 guix/build-system/guile.scm | 3 ++-
 guix/build-system/qt.scm    | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index 2056c04153..0aabc95b90 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2015, 2020-2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
@@ -240,6 +240,7 @@ build system."
                        #:parallel-tests? #$parallel-tests?
                        #:validate-runpath? #$validate-runpath?
                        #:patch-shebangs? #$patch-shebangs?
+                       #:make-dynamic-linker-cache? #f ;cross-compiling
                        #:strip-binaries? #$strip-binaries?
                        #:strip-flags #$strip-flags
                        #:strip-directories #$strip-directories))))
diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm
index 09148f8730..5e0e5bbad3 100644
--- a/guix/build-system/go.scm
+++ b/guix/build-system/go.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2016 Petter <petter@mykolab.ch>
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
-;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021-2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
@@ -276,6 +276,7 @@ commit hash and its date rather than a proper release tag."
                   #:unpack-path #$unpack-path
                   #:build-flags #$build-flags
                   #:tests? #$tests?
+                  #:make-dynamic-linker-cache? #f ;cross-compiling
                   #:allow-go-reference? #$allow-go-reference?
                   #:inputs %build-inputs)))
 
diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm
index f64f214675..36a88e181a 100644
--- a/guix/build-system/guile.scm
+++ b/guix/build-system/guile.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018-2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -162,6 +162,7 @@
                        #:native-search-paths '#$(map
                                                  
search-path-specification->sexp
                                                  native-search-paths)
+                       #:make-dynamic-linker-cache? #f ;cross-compiling
                        #:phases #$phases))))
 
   (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index 003a065aa6..a0b968cef3 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2015, 2021-2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
@@ -247,6 +247,7 @@ build system."
                     #:parallel-tests? #$parallel-tests?
                     #:validate-runpath? #$validate-runpath?
                     #:patch-shebangs? #$patch-shebangs?
+                    #:make-dynamic-linker-cache? #f ;cross-compiling
                     #:strip-binaries? #$strip-binaries?
                     #:strip-flags #$strip-flags
                     #:strip-directories #$strip-directories))))