Pulling in latest software construction toolkit.

site_scons/site_tools/distcc.py

 #!/usr/bin/python2.4
 # Copyright 2008, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 22 matching lines @@
 Since this modifies the C compiler strings, it must be specified after the
 compiler tool in the tool list.
 
 Distcc support can be enabled by specifying --distcc on the SCons command
 line.
 """
 
 
 import optparse
 import os
+import sys
 from SCons.compat._scons_optparse import OptionConflictError
 import SCons.Script
 
 
 def generate(env):
   # NOTE: SCons requires the use of this name, which fails gpylint.
   """SCons entry point for this tool."""
   if not env.Detect('distcc'):
     return
 
@@ skipping 24 matching lines @@
     env['ENV'][envvar] = value
 
   # Set name of distcc tool
   env['DISTCC'] = 'distcc'
 
   # Modify compilers we support
   distcc_compilers = env.get('DISTCC_COMPILERS', ['cc', 'gcc', 'c++', 'g++'])
   for compiler_var in ('CC', 'CXX'):
     compiler = env.get(compiler_var)
     if compiler in distcc_compilers:
+      if sys.platform == 'darwin':
+        # On Mac, distcc requires the full path to the compiler
+        compiler = env.WhereIs(compiler)
       env[compiler_var] = '$DISTCC ' + compiler
 
 
 def exists(env):
   """Returns true if tool exists."""
   # NOTE: SCons requires the use of this name, which fails gpylint.
   return env.Detect('distcc')