From 4aea820f0954fce4d076718072faf211f62f3f9d Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 15 Apr 2019 16:57:12 +0200
Subject: guix build: Fix relative file name canonicalization for '--root'.

Fixes <https://bugs.gnu.org/35271>.
Reported by rendaw <7e9wc56emjakcm@s.rendaw.me>.

* guix/scripts/build.scm (register-root): When ROOT is a relative file
name, append the basename of ROOT, not ROOT itself.
* tests/guix-build.sh: Add test.
---
 tests/guix-build.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'tests/guix-build.sh')

diff --git a/tests/guix-build.sh b/tests/guix-build.sh
index 66bf6be8d0..d479296ef1 100644
--- a/tests/guix-build.sh
+++ b/tests/guix-build.sh
@@ -183,6 +183,13 @@ then false; else true; fi
 
 rm -f "$result"
 
+# Check relative file name canonicalization: <https://bugs.gnu.org/35271>.
+mkdir "$result"
+guix build -r "$result/x" -e '(@@ (gnu packages bootstrap) %bootstrap-guile)'
+test -x "$result/x/bin/guile"
+rm "$result/x"
+rmdir "$result"
+
 # Cross building.
 guix build coreutils --target=mips64el-linux-gnu --dry-run --no-substitutes
 
-- 
cgit v1.2.3