Eliminate build differences in nacl gated on nacl_standalone.

buildbot/buildbot_lib.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Enable 'with' statements in Python 2.5
 from __future__ import with_statement
 
 import optparse
 import os.path
@@ skipping 66 matching lines @@
   # ASan is Clang, so set the flag to simplify other checks.
   context['clang'] = options.clang or options.asan
   context['validator'] = options.validator
   context['asan'] = options.asan
   # TODO(ncbray) turn derived values into methods.
   context['gyp_mode'] = {'opt': 'Release', 'dbg': 'Debug'}[mode]
   context['gyp_arch'] = {'32': 'ia32', '64': 'x64'}[bits]
   context['gyp_vars'] = []
   if context['clang']:
     context['gyp_vars'].append('clang=1')
+  else:
+    context['gyp_vars'].append('clang=0')
   if context['asan']:
     context['gyp_vars'].append('asan=1')
   context['vc_arch'] = {'32': 'x86', '64': 'x64'}[bits]
   context['default_scons_platform'] = 'x86-'+bits
   context['default_scons_mode'] = [mode + '-host', 'nacl']
   context['use_glibc'] = clib == 'glibc'
   context['max_jobs'] = 8
   context['dry_run'] = options.dry_run
   context['inside_toolchain'] = options.inside_toolchain
   context['step_suffix'] = options.step_suffix
@@ skipping 353 matching lines @@
 
   # Workaround for an annotator bug.
   # TODO(bradnelson@google.com) remove when the bug is fixed.
   if status.ever_failed:
     with Step('summary', status):
         print 'There were failed stages.'
 
   # Display a summary of the build.  Useful when running outside the buildbot.
   status.DisplayBuildStatus()
   sys.exit(status.ReturnValue())