Switch PNaCl lib, include, and translator directories for new layout

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.
 # See "class Environment" defined later for the implementation.
 
 from driver_log import Log, DriverExit
 from shelltools import shell
 import types
 
 INITIAL_ENV = {
   # Set by DriverMain
   'DRIVER_PATH'     : '', # Absolute path to this driver invocation
   'DRIVER_BIN'      : '', # PNaCl driver bin/ directory
   '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", "darwin" or "windows"
   'BUILD_ARCH'      : '${@GetBuildArch}',      # "x86_64" or "i686" or "i386"
 
   # Directories
+  'CLANG_VER'       : '3.4', # 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}/lib-',
+  'BASE_LIB_NATIVE' : '${BASE}/translator/',
 
-  'BASE_USR'        : '${BASE}/usr',
+  'BASE_USR'        : '${BASE}/le32-nacl',
   'BASE_SDK'        : '${BASE}/sdk',
-  'BASE_LIB'        : '${BASE}/lib',
+  'BASE_LIB'        : '${BASE}/lib/clang/${CLANG_VER}/lib/le32-nacl',
   'BASE_USR_ARCH'   : '${BASE_USR_%BCLIB_ARCH%}',
-  'BASE_USR_X8632'  : '${BASE}/usr-bc-x86-32',
-  'BASE_USR_X8664'  : '${BASE}/usr-bc-x86-64',
-  'BASE_USR_ARM'    : '${BASE}/usr-bc-arm',
+  'BASE_USR_X8632'  : '${BASE}/x86-32_bc-nacl',
+  'BASE_USR_X8664'  : '${BASE}/x86-64_bc-nacl',
+  'BASE_USR_ARM'    : '${BASE}/arm_bc-nacl',
   'BASE_LIB_ARCH'   : '${BASE_LIB_%BCLIB_ARCH%}',
-  'BASE_LIB_X8632'  : '${BASE}/lib-bc-x86-32',
-  'BASE_LIB_X8664'  : '${BASE}/lib-bc-x86-64',
-  'BASE_LIB_ARM'    : '${BASE}/lib-bc-arm',
+  'BASE_LIB_X8632'  : '${BASE}/lib/clang/${CLANG_VER}/lib/x86-32_bc-nacl',
+  'BASE_LIB_X8664'  : '${BASE}/lib/clang/${CLANG_VER}/lib/x86-64_bc-nacl',
+  'BASE_LIB_ARM'    : '${BASE}/lib/clang/${CLANG_VER}/lib/arm_bc-nacl',
 
   'LIBS_NATIVE_ARCH' : '${LIBS_NATIVE_%ARCH%}',
-  'LIBS_NATIVE_ARM' : '${BASE_LIB_NATIVE}arm',
-  'LIBS_NATIVE_ARM_NONSFI' : '${BASE_LIB_NATIVE}arm-nonsfi',
-  'LIBS_NATIVE_X8632' : '${BASE_LIB_NATIVE}x86-32',
-  'LIBS_NATIVE_X8632_NONSFI' : '${BASE_LIB_NATIVE}x86-32-nonsfi',
-  'LIBS_NATIVE_X8664' : '${BASE_LIB_NATIVE}x86-64',
-  'LIBS_NATIVE_MIPS32' : '${BASE_LIB_NATIVE}mips32',
+  'LIBS_NATIVE_ARM' : '${BASE_LIB_NATIVE}arm/lib',
+  'LIBS_NATIVE_ARM_NONSFI' : '${BASE_LIB_NATIVE}arm-nonsfi/lib',
+  'LIBS_NATIVE_X8632' : '${BASE_LIB_NATIVE}x86-32/lib',
+  'LIBS_NATIVE_X8632_NONSFI' : '${BASE_LIB_NATIVE}x86-32-nonsfi/lib',
+  'LIBS_NATIVE_X8664' : '${BASE_LIB_NATIVE}x86-64/lib',
+  'LIBS_NATIVE_MIPS32' : '${BASE_LIB_NATIVE}mips32/lib',
 
   'BASE_LLVM_BIN'   : '${BASE_LLVM}/bin',
   'TRANSLATOR_BIN'  :
-    '${BASE_TOOLCHAIN}/pnacl_translator/${STANDARD_ARCH}/bin',
+    '${BASE_TOOLCHAIN}/pnacl_translator/translator/${TRANSLATOR_ARCH}/bin',
 
-  # TODO(pdox): Unify this with ARCH.
-  'STANDARD_ARCH'       : '${STANDARD_ARCH_%ARCH%}',
-  'STANDARD_ARCH_X8632' : 'i686',
-  'STANDARD_ARCH_X8664' : 'x86_64',
-  'STANDARD_ARCH_ARM'   : 'armv7',
-  'STANDARD_ARCH_MIPS32': 'mips32',
+  # TODO(dschuff): Switch these directories to be triple-style arches,
+  # to match the main toolchain?
+  'TRANSLATOR_ARCH'       : '${TRANSLATOR_ARCH_%ARCH%}',
+  'TRANSLATOR_ARCH_X8632' : 'x86-32',
+  'TRANSLATOR_ARCH_X8664' : 'x86-64',
+  'TRANSLATOR_ARCH_ARM'   : 'arm',
+  'TRANSLATOR_ARCH_MIPS32': 'mips32',
 
   'SCONS_OUT'       : '${BASE_NACL}/scons-out',
 
   # Driver settings
   'ARCH'        : '',     # Target architecture, including optional
                           # suffixes such as '_NONSFI' or '_LINUX'.
   'BASE_ARCH'   : '',     # Target architecture without any '_NONSFI' suffix.
                           # Derived from ARCH field.
   'NONSFI_NACL' : '0',    # Whether targeting Non-SFI Mode.  Derived from
                           # ARCH field.
@@ skipping 430 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))