summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-22 10:38:16 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-22 10:38:16 +0000
commit82a1dd179f7c235eca2a53ffcf60b23e3073217b (patch)
treef3d949380bedc210c80273f133781eb7925e0711
parent911aca34fc3e094e3bfcdecd7e1548290678c2e1 (diff)
downloadportage-82a1dd179f7c235eca2a53ffcf60b23e3073217b.tar.gz
portage-82a1dd179f7c235eca2a53ffcf60b23e3073217b.tar.bz2
portage-82a1dd179f7c235eca2a53ffcf60b23e3073217b.zip
Fix gcc version parsing once again for bug #137786. sigh. :)
svn path=/main/trunk/; revision=4794
-rwxr-xr-xbin/emerge4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 86a26b7f2..72ba71ef3 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -297,8 +297,8 @@ def getgccversion(chost):
return myoutput.replace(chost + "-", gcc_ver_prefix, 1)
mystatus, myoutput = commands.getstatusoutput("gcc-config -c")
- if mystatus == os.EX_OK and len(myoutput.split("-")) > 0:
- return gcc_ver_prefix + myoutput.split("-")[-1]
+ if mystatus == os.EX_OK and myoutput.startswith(chost + "-"):
+ return myoutput.replace(chost + "-", gcc_ver_prefix, 1)
mystatus, myoutput = commands.getstatusoutput(
chost + "-" + gcc_ver_command)