gcc-config: fix relative ROOT handling

Fix suggested by Greg.

URL: https://bugs.gentoo.org/431104
Reported-by: Greg Turner <gmturner007@ameritech.net>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

3 files changed, 18 insertions, 2 deletions

diff --git a/gcc-config b/gcc-config
index c545974..9cf69fb 100755
--- a/gcc-config
+++ b/gcc-config
@@ -8,7 +8,7 @@
 
 : ${ROOT:=/}
 [[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
-[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}"
+[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}"
 
 cd /
 
diff --git a/tests/multi-native-selected-configs/test.list b/tests/multi-native-selected-configs/test.list
index 8e2a891..7c351a1 100644
--- a/tests/multi-native-selected-configs/test.list
+++ b/tests/multi-native-selected-configs/test.list
@@ -1,3 +1,9 @@
 #!/bin/bash
 gcc-config -C -l "$@"
-[[ $? -eq 0 ]]
+[[ $? -eq 0 ]] || exit 1
+
+(
+cd "${ROOT}"
+ROOT=. gcc-config -C -l "$@"
+[[ $? -eq 0 ]] || exit 1
+)
diff --git a/tests/multi-native-selected-configs/test.list.exp b/tests/multi-native-selected-configs/test.list.exp
index 2bd4005..e2a79dd 100644
--- a/tests/multi-native-selected-configs/test.list.exp
+++ b/tests/multi-native-selected-configs/test.list.exp
@@ -8,3 +8,13 @@ Using gcc-config info in @ROOT@/
  [4] x86_64-pc-linux-gnu-4.6.0
  [5] x86_64-pc-linux-gnu-4.6.1 *
  [6] x86_64-pc-linux-gnu-4.6.2
+Using gcc-config info in @ROOT@/./
+ [1] avr-4.5.3 *
+
+ [2] powerpc64-unknown-linux-gnu-4.5.3 *
+
+ [3] sh4-unknown-linux-gnu-4.5.3 *
+
+ [4] x86_64-pc-linux-gnu-4.6.0
+ [5] x86_64-pc-linux-gnu-4.6.1 *
+ [6] x86_64-pc-linux-gnu-4.6.2