[gentoo-commits] proj/gcc-config:master commit in: tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/, /, ...

[gentoo-commits] proj/gcc-config:master commit in: tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/, /, ...

[Mike Frysinger]

commit:     d3656352eca7adbea2fa29994c01052834b28dc9
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu May 31 04:16:07 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu May 31 04:26:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git;a=commit;h=d3656352

gcc-config: fix old wrapper removal code path

While this code path won't fire on a sane setup, we still need it to
function on an insane one, so fix the old variable name (which has been
broken since it was originally added due to rewrites while it was under
initial development) so the stale wrapper actually gets removed.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 gcc-config                                         |    2 +-
 .../etc/env.d/gcc/x86_64-pc-linux-gnu-4.7.0        |    5 +++++
 tests/rw-multi-native-configs/test.select-insane   |    6 ++++++
 .../rw-multi-native-configs/test.select-insane.exp |    5 +++++
 4 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/gcc-config b/gcc-config
index d81719b..554ff2b 100755
--- a/gcc-config
+++ b/gcc-config
@@ -263,7 +263,7 @@ update_wrappers() {
 		else
 			ewarn "double insanity with ${x} and ${ref}"
 			# Make sure we have no stale wrappers
-			rm -f "${bin}"
+			rm -f "${ROOT}usr/bin/${x}"
 		fi
 	done
 	# legacy cruft, make sure we dont leave it laying around #143205

diff --git a/tests/rw-multi-native-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-4.7.0 b/tests/rw-multi-native-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-4.7.0
new file mode 100644
index 0000000..3f6c0dc
--- /dev/null
+++ b/tests/rw-multi-native-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-4.7.0
@@ -0,0 +1,5 @@
+LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0:/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/32"
+MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.7.0/man"
+INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.7.0/info"
+STDCXX_INCDIR="g++-v4"
+GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0"

diff --git a/tests/rw-multi-native-configs/test.select-insane b/tests/rw-multi-native-configs/test.select-insane
new file mode 100644
index 0000000..884598d
--- /dev/null
+++ b/tests/rw-multi-native-configs/test.select-insane
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+gcc-config -C 4.6.2
+touch usr/bin/gcj
+gcc-config -C 4.7.0
+[[ ! -e usr/bin/gcj ]]

diff --git a/tests/rw-multi-native-configs/test.select-insane.exp b/tests/rw-multi-native-configs/test.select-insane.exp
new file mode 100644
index 0000000..0d7954d
--- /dev/null
+++ b/tests/rw-multi-native-configs/test.select-insane.exp
@@ -0,0 +1,5 @@
+ * Switching native-compiler to x86_64-pc-linux-gnu-4.6.2 ... [ ok ]
+ * Switching native-compiler to x86_64-pc-linux-gnu-4.7.0 ...
+ * double insanity with x86_64-pc-linux-gnu-gcj and @ROOT@//usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcj
+ * double insanity with gcj and @ROOT@//usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcj
+ [ ok ]

diff --git a/tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/32/.keep b/tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/32/.keep
new file mode 100644
index 0000000..e69de29

diff --git a/tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/libgcc.a b/tests/rw-multi-native-configs/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/libgcc.a
new file mode 100644
index 0000000..e69de29

diff --git a/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/cpp b/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/cpp
new file mode 100755
index 0000000..e69de29

diff --git a/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcc b/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcc
new file mode 100755
index 0000000..e69de29

diff --git a/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcj b/tests/rw-multi-native-configs/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcj
new file mode 100644
index 0000000..e69de29