| 1 |
commit: d3656352eca7adbea2fa29994c01052834b28dc9 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 31 04:16:07 2012 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 31 04:26:03 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git;a=commit;h=d3656352 |
| 7 |
|
| 8 |
gcc-config: fix old wrapper removal code path |
| 9 |
|
| 10 |
While this code path won't fire on a sane setup, we still need it to |
| 11 |
function on an insane one, so fix the old variable name (which has been |
| 12 |
broken since it was originally added due to rewrites while it was under |
| 13 |
initial development) so the stale wrapper actually gets removed. |
| 14 |
|
| 15 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
| 16 |
|
| 17 |
--- |
| 18 |
gcc-config | 2 +- |
| 19 |
.../etc/env.d/gcc/x86_64-pc-linux-gnu-4.7.0 | 5 +++++ |
| 20 |
tests/rw-multi-native-configs/test.select-insane | 6 ++++++ |
| 21 |
.../rw-multi-native-configs/test.select-insane.exp | 5 +++++ |
| 22 |
4 files changed, 17 insertions(+), 1 deletions(-) |
| 23 |
|
| 24 |
diff --git a/gcc-config b/gcc-config |
| 25 |
index d81719b..554ff2b 100755 |
| 26 |
--- a/gcc-config |
| 27 |
+++ b/gcc-config |
| 28 |
@@ -263,7 +263,7 @@ update_wrappers() { |
| 29 |
else |
| 30 |
ewarn "double insanity with ${x} and ${ref}" |
| 31 |
# Make sure we have no stale wrappers |
| 32 |
- rm -f "${bin}" |
| 33 |
+ rm -f "${ROOT}usr/bin/${x}" |
| 34 |
fi |
| 35 |
done |
| 36 |
# legacy cruft, make sure we dont leave it laying around #143205 |
| 37 |
|
| 38 |
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 |
| 39 |
new file mode 100644 |
| 40 |
index 0000000..3f6c0dc |
| 41 |
--- /dev/null |
| 42 |
+++ b/tests/rw-multi-native-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-4.7.0 |
| 43 |
@@ -0,0 +1,5 @@ |
| 44 |
+LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0:/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.0/32" |
| 45 |
+MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.7.0/man" |
| 46 |
+INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.7.0/info" |
| 47 |
+STDCXX_INCDIR="g++-v4" |
| 48 |
+GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0" |
| 49 |
|
| 50 |
diff --git a/tests/rw-multi-native-configs/test.select-insane b/tests/rw-multi-native-configs/test.select-insane |
| 51 |
new file mode 100644 |
| 52 |
index 0000000..884598d |
| 53 |
--- /dev/null |
| 54 |
+++ b/tests/rw-multi-native-configs/test.select-insane |
| 55 |
@@ -0,0 +1,6 @@ |
| 56 |
+#!/bin/bash |
| 57 |
+ |
| 58 |
+gcc-config -C 4.6.2 |
| 59 |
+touch usr/bin/gcj |
| 60 |
+gcc-config -C 4.7.0 |
| 61 |
+[[ ! -e usr/bin/gcj ]] |
| 62 |
|
| 63 |
diff --git a/tests/rw-multi-native-configs/test.select-insane.exp b/tests/rw-multi-native-configs/test.select-insane.exp |
| 64 |
new file mode 100644 |
| 65 |
index 0000000..0d7954d |
| 66 |
--- /dev/null |
| 67 |
+++ b/tests/rw-multi-native-configs/test.select-insane.exp |
| 68 |
@@ -0,0 +1,5 @@ |
| 69 |
+ * Switching native-compiler to x86_64-pc-linux-gnu-4.6.2 ... [ ok ] |
| 70 |
+ * Switching native-compiler to x86_64-pc-linux-gnu-4.7.0 ... |
| 71 |
+ * double insanity with x86_64-pc-linux-gnu-gcj and @ROOT@//usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcj |
| 72 |
+ * double insanity with gcj and @ROOT@//usr/x86_64-pc-linux-gnu/gcc-bin/4.7.0/gcj |
| 73 |
+ [ ok ] |
| 74 |
|
| 75 |
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 |
| 76 |
new file mode 100644 |
| 77 |
index 0000000..e69de29 |
| 78 |
|
| 79 |
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 |
| 80 |
new file mode 100644 |
| 81 |
index 0000000..e69de29 |
| 82 |
|
| 83 |
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 |
| 84 |
new file mode 100755 |
| 85 |
index 0000000..e69de29 |
| 86 |
|
| 87 |
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 |
| 88 |
new file mode 100755 |
| 89 |
index 0000000..e69de29 |
| 90 |
|
| 91 |
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 |
| 92 |
new file mode 100644 |
| 93 |
index 0000000..e69de29 |
Archives