diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
commit | 53c85e97dcc264da5ff5cd4e3be4d47028f4d726 (patch) | |
tree | 8984fefeb61e0c165bf960fdfa3cd11355d02ba3 /tests/union.scm | |
parent | 2e838890ff989128e8a78eea574d1ad158dd6361 (diff) | |
parent | c320011da5e743f47220f380c818e95394f6d9c0 (diff) | |
download | guix-patches-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar guix-patches-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar.gz |
Merge branch 'core-updates'
Conflicts:
gnu/packages/gnunet.scm
Diffstat (limited to 'tests/union.scm')
-rw-r--r-- | tests/union.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/union.scm b/tests/union.scm index cb110c3b1e..54e2850942 100644 --- a/tests/union.scm +++ b/tests/union.scm @@ -116,10 +116,10 @@ (directory-exists? "lib/gcc") (file-exists? "include/unistd.h") - ;; The 'include' sub-directory is only found in - ;; glibc-bootstrap, so it should be unified in a + ;; The 'include/c++' sub-directory is only found in + ;; gcc-bootstrap, so it should be unified in a ;; straightforward way, without traversing it. - (eq? 'symlink (stat:type (lstat "include"))) + (eq? 'symlink (stat:type (lstat "include/c++"))) ;; Conversely, several inputs have a 'bin' sub-directory, so ;; unifying it requires traversing them all, and creating a |