02/03: union: Do not warn about "ld.so.cache" collisions.

[guix-commits]

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

commit afe8c67ac1e29f7ddfedbd59357406f74206b777
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Sep 25 16:13:39 2021 +0200

    union: Do not warn about "ld.so.cache" collisions.
    
    This is a followup to f85efa86e7690d9181946351631e02b1c20958c9.
    
    * guix/build/union.scm (%harmless-collisions): Add "ld.so.cache".
---
 guix/build/union.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/guix/build/union.scm b/guix/build/union.scm
index 961ac32..bf75c67 100644
--- a/guix/build/union.scm
+++ b/guix/build/union.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2018, 2019 Ludovic Courtès 
<ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2018, 2019, 2021 Ludovic Courtès 
<ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2017 Huang Ying <huang.ying.caritas@gmail.com>
 ;;;
@@ -99,8 +99,9 @@ identical, #f otherwise."
   ;; a warning doesn't make sense.  For example, "icon-theme.cache" is
   ;; regenerated by a profile hook which shadows the file provided by
   ;; individual packages, and "gschemas.compiled" is made available to
-  ;; applications via 'glib-or-gtk-build-system'.
-  '("icon-theme.cache" "gschemas.compiled"))
+  ;; applications via 'glib-or-gtk-build-system'; "etc/ld.so.cache" is created
+  ;; for most packages.
+  '("icon-theme.cache" "gschemas.compiled" "ld.so.cache"))
 
 (define (warn-about-collision files)
   "Handle the collision among FILES by emitting a warning and choosing the