Merge branch 'master' into ssh-fix

1 files changed, 7 insertions, 0 deletions

diff --git a/update-distcc-symlinks.py b/update-distcc-symlinks.py
index f467ead..af0fffe 100755
--- a/update-distcc-symlinks.py
+++ b/update-distcc-symlinks.py
@@ -4,6 +4,7 @@ import subprocess, string, os, stat, re
 
 distcc_dir = "/usr/lib/distcc"
 gcc_dir = "/usr/lib/gcc"
+gcccross_dir = "/usr/lib/gcc-cross"
 old_symlinks = set()
 new_symlinks = set()
 standard_names = ["cc", "c++", "c89", "c99"]
@@ -35,6 +36,12 @@ for gnu_host in os.listdir(gcc_dir):
   for version in os.listdir(gcc_dir + "/" + gnu_host):
     consider_gcc("", "-%(version)s" % vars())
     consider_gcc("%(gnu_host)s-" % vars(), "-%(version)s" % vars())
+for gnu_host in os.listdir(gcccross_dir):
+  consider_gcc("%(gnu_host)s-" % vars(), "")
+  for version in os.listdir(gcccross_dir + "/" + gnu_host):
+    consider_gcc("", "-%(version)s" % vars())
+    consider_gcc("%(gnu_host)s-" % vars(), "-%(version)s" % vars())
+
 
 consider_clang("")
 for ent in os.listdir("/usr/lib"):