guix-commits
[Top][All Lists]
Advanced

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

01/02: build-system/gnu: Disable 'ld.so.cache' generation when cross-com


From: guix-commits
Subject: 01/02: build-system/gnu: Disable 'ld.so.cache' generation when cross-compiling.
Date: Sun, 21 Feb 2021 17:06:02 -0500 (EST)

civodul pushed a commit to branch core-updates
in repository guix.

commit 1209447ad3f471d12e9408dd478b3cfcd7b7a07e
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Feb 21 22:46:03 2021 +0100

    build-system/gnu: Disable 'ld.so.cache' generation when cross-compiling.
    
    * guix/build-system/gnu.scm (gnu-cross-build): Change
     #:make-dynamic-linker-cache? to #f.
---
 guix/build-system/gnu.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index abff7d6..fc045f1 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès 
<ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020, 2021 Ludovic 
Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -506,7 +506,12 @@ is one of `host' or `target'."
                           (strip-directories ''("lib" "lib64" "libexec"
                                                 "bin" "sbin"))
                           (validate-runpath? #t)
-                          (make-dynamic-linker-cache? #t)
+
+                          ;; We run 'ldconfig' to generate ld.so.cache and it
+                          ;; generally can't do that for cross-built binaries
+                          ;; ("ldconfig: foo.so is for unknown machine 40.").
+                          (make-dynamic-linker-cache? #f)
+
                           (license-file-regexp %license-file-regexp)
                           (phases '%standard-phases)
                           (locale "en_US.utf8")



reply via email to

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