Update PNaCl to LLVM/Clang/Libcxx 223109 (nacl-change)

pnacl/driver/driver_env.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.
 
 # Global environment and expression parsing for the PNaCl driver
 
 
 # This dictionary initializes a shell-like environment.
 # Shell escaping and ${} substitution are provided.
@@ skipping 10 matching lines @@
   'DRIVER_REV_FILE' : '${BASE}/REV',
 
   'BASE_NACL'       : '${@FindBaseNaCl}',      # Absolute path of native_client/
   'BASE_TOOLCHAIN'  : '${@FindBaseToolchain}', # Absolute path to toolchain/OS_ARCH/
   'BASE'            : '${@FindBasePNaCl}',     # Absolute path to PNaCl
   'BUILD_OS'        : '${@GetBuildOS}',        # "linux", "nacl", "darwin"
                                                # or "windows"
   'BUILD_ARCH'      : '${@GetBuildArch}',      # "x86_64" or "i686" or "i386"
 
   # Directories
-  'CLANG_VER'       : '3.5.0', # Included in path to compiler-owned libs/headers
+  'CLANG_VER'       : '3.6.0', # Included in path to compiler-owned libs/headers
   'BPREFIXES'       : '', # Prefixes specified using the -B flag.
   'BASE_LLVM'       : '${@FindBaseHost:clang}',
   'BASE_BINUTILS'   : '${@FindBaseHost:le32-nacl-ar}',
 
   'BASE_LIB_NATIVE' : '${BASE}/translator/',
 
   'BASE_USR'        : '${BASE}/le32-nacl',
   'BASE_SDK'        : '${BASE}/sdk',
   'BASE_LIB'        : '${BASE}/lib/clang/${CLANG_VER}/lib/le32-nacl',
   'BASE_USR_ARCH'   : '${BASE_USR_%BCLIB_ARCH%}',
@@ skipping 475 matching lines @@
 
 
 env = Environment()
 
 def override_env(meth_name, func):
   """Override a method in the global |env|, given the method name
   and the new function.
   """
   global env
   setattr(env, meth_name, types.MethodType(func, env, Environment))