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

pnacl/driver/pnacl-driver.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 re
 import subprocess
 
 from driver_tools import AddHostBinarySearchPath, DefaultOutputName, \
     DriverChain, GetArch, ParseArgs, ParseTriple, Run, RunDriver, RunWithEnv, \
@@ skipping 84 matching lines @@
   'ISYSTEM_USER'   : '',  # System include directories specified by
                           # using the -isystem flag.
 
   'ISYSTEM_BUILTIN':
     '${BASE_USR}/local/include ' +
     '${ISYSTEM_CLANG} ' +
     '${ISYSTEM_CXX} ' +
     '${BASE_USR}/include ' +
     '${BASE_SDK}/include ',
 
-  'ISYSTEM_CLANG'  : '${BASE_LLVM}/lib/clang/3.4/include',
+  'ISYSTEM_CLANG'  : '${BASE_LLVM}/lib/clang/${CLANG_VER}/include',
 
   'ISYSTEM_CXX' :
     '${INCLUDE_CXX_HEADERS && STDINCCXX ? ${ISYSTEM_CXX_include_paths}}',
 
   'ISYSTEM_CXX_include_paths' :
     '${BASE_USR}/include/c++/${STDLIB_IDIR} ' +
     '${BASE_USR}/include/c++/${STDLIB_IDIR}/arm-none-linux-gnueabi ' +
     '${BASE_USR}/include/c++/${STDLIB_IDIR}/backward',
 
 
@@ skipping 670 matching lines @@
   -g                    Generate complete debug information.
   -gline-tables-only    Generate debug line-information only
                         (allowing for stack traces).
   -flimit-debug-info    Generate limited debug information.
   -save-temps           Keep intermediate compilation results.
   -v                    Verbose output / show commands.
   -h | --help           Show this help.
   --help-full           Show underlying clang driver's help message
                         (warning: not all options supported).
 """ % (tool)