aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-17 23:54:29 -0400
committerMike Frysinger <vapier@gentoo.org>2012-08-17 23:54:29 -0400
commit7f30cd15401b7c9d22af0690ee03f2c40415b502 (patch)
tree83b28be593f635a1c4f657c4f279790e140f9214
parentgcc-config: do not export GCC_SPECS for cross-compilers (diff)
downloadgcc-config-7f30cd15401b7c9d22af0690ee03f2c40415b502.tar.gz
gcc-config-7f30cd15401b7c9d22af0690ee03f2c40415b502.tar.bz2
gcc-config-7f30cd15401b7c9d22af0690ee03f2c40415b502.zip
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>
-rwxr-xr-xgcc-config2
-rw-r--r--tests/multi-native-selected-configs/test.list8
-rw-r--r--tests/multi-native-selected-configs/test.list.exp10
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