diff options
-rwxr-xr-x | bin/emerge | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index 40f1ae56b..0eae18a67 100755 --- a/bin/emerge +++ b/bin/emerge @@ -535,11 +535,13 @@ def getgccversion(): "!!! other terminals also.\n" ) - mystatus, myoutput = commands.getstatusoutput("gcc-config -c") - if mystatus == os.EX_OK and len(myoutput.split("-")) > 0: - return gcc_ver_prefix + myoutput.split("-")[-1] - 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 + + mystatus, myoutput = commands.getstatusoutput("gcc-config -c") if mystatus == os.EX_OK and len(myoutput.split("-")) > 0: return gcc_ver_prefix + myoutput.split("-")[-1] |