Handle both old and new pnacl toolchain locations.

build_tools/nacl_env.sh

 #!/bin/bash
 # Copyright (c) 2013 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.
 
 # Echo the environment variables need to to build/configure standard
 # GNU make/automake/configure projects.
 #
 # To import these variables into your environment do:
 # $ . nacl_env.sh
@@ skipping 130 matching lines @@
     for LA_FILE in ${LA_FILES}; do
       mv ${LA_FILE} ${LA_FILE}.old
     done
   fi
 
   NACL_SDK_LIBDIR="${NACL_SDK_ROOT}/lib/${NACL_LIBC}_${NACL_ARCH_ALT}/Release"
 }
 
 
 InitializePNaClToolchain() {
-  local TC_ROOT=${NACL_SDK_ROOT}/toolchain/${OS_SUBDIR}_x86_pnacl/${NACL_LIBC}
+  local TC_ROOT=${NACL_SDK_ROOT}/toolchain
+  # The PNaCl toolchain moved in pepper_30.  Check for
+  # the existence of the old folder first and use that
+  # if found.
+  if [ -d "${TC_ROOT}/${OS_SUBDIR}_x86_pnacl" ]; then
+    TC_ROOT=${TC_ROOT}/${OS_SUBDIR}_x86_pnacl/${NACL_LIBC}
+  else
+    TC_ROOT=${TC_ROOT}/${OS_SUBDIR}_pnacl
+  fi
   readonly NACL_TOOLCHAIN_ROOT=${NACL_TOOLCHAIN_ROOT:-${TC_ROOT}}
   readonly NACL_BIN_PATH=${NACL_TOOLCHAIN_ROOT}/bin
 
   # export nacl tools for direct use in patches.
   export NACLCC=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-clang
   export NACLCXX=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-clang++
   export NACLAR=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ar
   export NACLRANLIB=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ranlib
   export NACLLD=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ld
   export NACLSTRINGS=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strings
@@ skipping 39 matching lines @@
     export CXX=${NACLCXX}
     export AR=${NACLAR}
     export RANLIB=${NACLRANLIB}
     export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig
     export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}
     export PATH=${PATH}:${NACL_BIN_PATH}
     export CFLAGS=${NACL_CFLAGS}
     exec $@
   fi
 fi