Add support for goma-clang to make builds, switch macmake fyi bot over.

build/scripts/slave/compile.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A tool to build chrome, executed by buildbot.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 395 matching lines @@
   return codename
 
 
 def common_make_settings(
     command, options, env, crosstool=None, compiler=None):
   """
   Sets desirable environment variables and command-line options
   that are common to the Make and SCons builds. Used on Linux
   and for the mac make build.
   """
-  # TODO(thakis): Add goma-clang support to the make build.
-  assert compiler in (None, 'clang', 'goma', 'asan', 'tsan_gcc')
+  assert compiler in (None, 'clang', 'goma', 'goma-clang', 'asan', 'tsan_gcc')
   if options.mode == 'google_chrome' or options.mode == 'official':
     env['CHROMIUM_BUILD'] = '_google_chrome'
 
   if options.mode == 'official':
     # Official builds are always Google Chrome.
     env['OFFICIAL_BUILD'] = '1'
     env['CHROME_BUILD_TYPE'] = '_official'
 
   # Don't stop at the first error.
   command.append('-k')
@@ skipping 37 matching lines @@
       env['CXX'] = ccache + crosstool + '-g++'
       env['LD'] = crosstool + '-ld'
       env['RANLIB'] = crosstool + '-ranlib'
       command.append('-j%d' % jobs)
       # Don't use build-in rules.
       command.append('-r')
       # For now only build chrome, as other things will break.
       command.append('chrome')
       return
 
-  if compiler == 'goma':
-    print 'using goma'
-    env['CC'] = 'gcc'
-    env['CXX'] = 'g++'
-    env['PATH'] = options.goma_dir + ':' + env['PATH']
-    goma_jobs = 100
+  if compiler in ('goma', 'goma-clang'):
+    print 'using', compiler
+    if compiler == 'goma':
+      env['CC'] = 'gcc'
+      env['CXX'] = 'g++'
+      env['PATH'] = options.goma_dir + ':' + env['PATH']
+    else:  # goma-clang
+      env['CC'] = 'clang'
+      env['CXX'] = 'clang++'
+      clang_dir = os.path.abspath(os.path.join(
+          slave_utils.SlaveBaseDir(options.build_dir), 'build', 'src',
+          'third_party', 'llvm-build', 'Release+Asserts', 'bin'))
+      env['PATH'] = options.goma_dir + ':' + + clang_dir + ':' + env['PATH']

[szager, 2011/10/14 20:11:27]

+ +
Syntax error?

Prefer:
env['PATH'] = ':'.join([ options.goma_dir,
                         clang_dir,
                         env['PATH'] ])

[Nico, 2011/10/14 20:16:48]

Done.

+    if chromium_utils.IsMac():
+      # The default process limit on 10.6 is 266 (`sysctl kern.maxprocperuid`),
+      # and about 100 processes are used by the system. The webkit bindings
+      # generation scripts open a preprocessor child process, so building at
+      # -j100 runs into the process limit. For now, just build with -j50.
+      goma_jobs = 50
+    else:
+      goma_jobs = 100
     if jobs < goma_jobs:
       jobs = goma_jobs
     command.append('-j%d' % jobs)
     return
 
   if compiler == 'clang':
     clang_dir = os.path.abspath(os.path.join(
         slave_utils.SlaveBaseDir(options.build_dir), 'build', 'src',
         'third_party', 'llvm-build', 'Release+Asserts', 'bin'))
     env['CC'] = os.path.join(clang_dir, 'clang')
@@ skipping 124 matching lines @@
 
   # V=1 prints the actual executed command
   if options.verbose:
     command.extend(['V=1'])
   command.extend(options.build_args + args)
 
   # If using the Goma compiler, first call goma_ctl with ensure_start
   # (or restart in clobber mode) to ensure the proxy is available.
   goma_ctl_cmd = [os.path.join(options.goma_dir, 'goma_ctl.sh')]
 
-  if options.compiler == 'goma':
+  if options.compiler in ('goma', 'goma-clang'):
     goma_key = os.path.join(options.goma_dir, 'goma.key')
     env['GOMA_COMPILER_PROXY_DAEMON_MODE'] = 'true'
     if os.path.exists(goma_key):
       env['GOMA_API_KEY_FILE'] = goma_key
     if options.clobber:
       chromium_utils.RunCommand(goma_ctl_cmd + ['restart'], env=env)
     else:
       chromium_utils.RunCommand(goma_ctl_cmd + ['ensure_start'], env=env)
 
   # Run the build.
   result = chromium_utils.RunCommand(command, env=env)
 
-  if options.compiler == 'goma':
+  if options.compiler in ('goma', 'goma-clang'):
     # Always stop the proxy for now to allow in-place update.
     chromium_utils.RunCommand(goma_ctl_cmd + ['stop'], env=env)
 
   return result
 
 
 def main_scons(options, args):
   """Interprets options, clobbers object files, and calls scons.
   """
   options.build_dir = os.path.abspath(options.build_dir)
@@ skipping 303 matching lines @@
     main = build_tool_map.get(options.build_tool)
     if not main:
       sys.stderr.write('Unknown build tool %s.\n' % repr(options.build_tool))
       return 2
 
   return main(options, args)
 
 
 if '__main__' == __name__:
   sys.exit(real_main())