diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-31 15:26:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-31 15:26:56 +0000 |
| commit | 516532c47c83c98c836788a308c3ac898c09c2cd (patch) | |
| tree | 6ef07238d62141f5622ee7d03ed04e2b4b7b0801 /bin/emerge | |
| parent | 6cc13ba91675357a7cefe2e2110d33db222dffd6 (diff) | |
| download | portage-516532c47c83c98c836788a308c3ac898c09c2cd.tar.gz portage-516532c47c83c98c836788a308c3ac898c09c2cd.tar.bz2 portage-516532c47c83c98c836788a308c3ac898c09c2cd.zip | |
Fix getgccversion logic for bug #137786 and bug #139662. This patch is from trunk r3632.
svn path=/main/branches/2.1/; revision=4056
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index da71d647f..b7d33e4a3 100755 --- a/bin/emerge +++ b/bin/emerge @@ -538,8 +538,8 @@ def getgccversion(): mystatus, myoutput = commands.getstatusoutput("eselect compiler show") if mystatus == os.EX_OK and len(myoutput.split("/")) == 2: part1, part2 = myoutput.split("/") - if len(part1.split("-")) > 0: - return gcc_ver_prefix + part1.split("-")[-1] + "/" + part2 + if part1.startswith(portage.settings["CHOST"] + "-"): + return myoutput.replace(portage.settings["CHOST"] + "-", gcc_ver_prefix, 1) mystatus, myoutput = commands.getstatusoutput("gcc-config -c") if mystatus == os.EX_OK and len(myoutput.split("-")) > 0: |