Remove i686-hosted Linux build and start switching to new directory layout

pnacl/driver/driver_tools.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.
 
 import platform
 import os
 import random
 import re
 import shlex
@@ skipping 212 matching lines @@
 @env.register
 def FindBaseHost(tool):
   """ Find the base directory for host binaries (i.e. llvm/binutils) """
   if env.has('BPREFIXES'):
     for prefix in env.get('BPREFIXES'):
       if os.path.exists(pathtools.join(prefix, 'bin',
                                        tool + env.getone('EXEC_EXT'))):
         return prefix
 
   base_pnacl = FindBasePNaCl()
-  base_host = pathtools.join(base_pnacl, 'host_' + env.getone('HOST_ARCH'))
-  if not pathtools.exists(pathtools.join(base_host, 'bin',
+  if not pathtools.exists(pathtools.join(base_pnacl, 'bin',
                           tool + env.getone('EXEC_EXT'))):
     Log.Fatal('Could not find PNaCl host directory for ' + tool)
-  return base_host
+  return base_pnacl
 
 def ReadConfig():
   # Mock out ReadConfig if running unittests.  Settings are applied directly
   # by DriverTestEnv rather than reading this configuration file.
   if env.has('PNACL_RUNNING_UNITTESTS'):
     return
   driver_bin = env.getone('DRIVER_BIN')
   driver_conf = pathtools.join(driver_bin, 'driver.conf')
   fp = DriverOpen(driver_conf, 'r')
   linecount = 0
@@ skipping 627 matching lines @@
         # Last step
         step_output = self.output
       else:
         # Intermediate step
         if self.use_names_for_input:
           step_output = self.namegen.TempNameForInput(self.input, output_type)
         else:
           step_output = self.namegen.TempNameForOutput(output_type)
       callback(step_input, step_output, **extra)
       step_input = step_output