update.py: Port remaining missing things from update.sh

tools/clang/scripts/update.sh

 #!/usr/bin/env bash
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script will check out llvm and clang into third_party/llvm and build it.
 
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://code.google.com/p/chromium/wiki/UpdatingClang
 # Reverting problematic clang rolls is safe, though.
@@ skipping 147 matching lines @@
       exit 1
       ;;
   esac
   shift
 done
 
 if [[ -n ${LLVM_FORCE_HEAD_REVISION:-''} ]]; then
   force_local_build=yes
 
   if ! [[ "$GYP_DEFINES" =~ .*OS=android.* ]]; then
-    # Only build the Android ASan rt when targetting Android.
+    # Only build the Android ASan rt on ToT bots when targetting Android.
     with_android=
   fi
 
   LLVM_BUILD_TOOLS_DIR="${ABS_LLVM_DIR}/../llvm-build-tools"
 
   if [[ "${OS}" == "Linux" ]] && [[ -z "${gcc_toolchain}" ]]; then
     if [[ $(gcc -dumpversion) < "4.7.0" ]]; then
       # We need a newer GCC version.
       if [[ ! -e "${LLVM_BUILD_TOOLS_DIR}/gcc482" ]]; then
         echo "Downloading pre-built GCC 4.8.2..."
@@ skipping 130 matching lines @@
 if ! svn co --force "${LLVM_REPO_URL}/llvm/trunk@${CLANG_REVISION}" \
                     "${LLVM_DIR}"; then
   echo Checkout failed, retrying
   rm -rf "${LLVM_DIR}"
   svn co --force "${LLVM_REPO_URL}/llvm/trunk@${CLANG_REVISION}" "${LLVM_DIR}"
 fi
 
 echo Getting clang r"${CLANG_REVISION}" in "${CLANG_DIR}"
 svn co --force "${LLVM_REPO_URL}/cfe/trunk@${CLANG_REVISION}" "${CLANG_DIR}"
 
-# We have moved from building compiler-rt in the LLVM tree, to a separate
-# directory. Nuke any previous checkout to avoid building it.
-rm -rf "${LLVM_DIR}/projects/compiler-rt"
-
 echo Getting compiler-rt r"${CLANG_REVISION}" in "${COMPILER_RT_DIR}"
 svn co --force "${LLVM_REPO_URL}/compiler-rt/trunk@${CLANG_REVISION}" \
                "${COMPILER_RT_DIR}"
 
 # clang needs a libc++ checkout, else -stdlib=libc++ won't find includes
 # (i.e. this is needed for bootstrap builds).
 if [ "${OS}" = "Darwin" ]; then
   echo Getting libc++ r"${CLANG_REVISION}" in "${LIBCXX_DIR}"
   svn co --force "${LLVM_REPO_URL}/libcxx/trunk@${CLANG_REVISION}" \
                  "${LIBCXX_DIR}"
@@ skipping 244 matching lines @@
     -DCMAKE_BUILD_TYPE=Release \
     -DLLVM_ENABLE_ASSERTIONS=ON \
     -DLLVM_ENABLE_THREADS=OFF \
     -DCMAKE_C_COMPILER="${CC}" \
     -DCMAKE_CXX_COMPILER="${CXX}" \
     -DCMAKE_CXX_FLAGS="${COMPILER_RT_CXXFLAGS}" \
     -DSANITIZER_MIN_OSX_VERSION="10.7" \
     -DLLVM_CONFIG_PATH="${ABS_LLVM_BUILD_DIR}/bin/llvm-config" \
     "${ABS_COMPILER_RT_DIR}"
 
-ninja
+ninja compiler-rt
 
-# Copy selected output to the main tree.
+# Copy select output to the main tree.
 # Darwin doesn't support cp --parents, so pipe through tar instead.
 CLANG_VERSION=$("${ABS_LLVM_BUILD_DIR}/bin/clang" --version | \
      sed -ne 's/clang version \([0-9]\.[0-9]\.[0-9]\).*/\1/p')
 ABS_LLVM_CLANG_LIB_DIR="${ABS_LLVM_BUILD_DIR}/lib/clang/${CLANG_VERSION}"
+# Blacklists:
 tar -c *blacklist.txt | tar -C ${ABS_LLVM_CLANG_LIB_DIR} -xv
+# Headers:
 tar -c include/sanitizer | tar -C ${ABS_LLVM_CLANG_LIB_DIR} -xv
+# Static and dynamic libraries:
 if [[ "${OS}" = "Darwin" ]]; then
   tar -c lib/darwin | tar -C ${ABS_LLVM_CLANG_LIB_DIR} -xv
 else
   tar -c lib/linux | tar -C ${ABS_LLVM_CLANG_LIB_DIR} -xv
 fi
 
 popd
 
 if [[ -n "${with_android}" ]]; then
-  # Make a standalone Android toolchain.
+  # Make standalone Android toolchains.
   ${ANDROID_NDK_DIR}/build/tools/make-standalone-toolchain.sh \
       --platform=android-19 \
       --install-dir="${LLVM_BUILD_DIR}/android-toolchain-arm" \
       --system=linux-x86_64 \
       --stl=stlport \
       --toolchain=arm-linux-androideabi-4.9
 
   # Do the same for arm64.
   ${ANDROID_NDK_DIR}/build/tools/make-standalone-toolchain.sh \
       --platform=android-21 \
@@ skipping 12 matching lines @@
 
   for target_arch in "aarch64" "arm" "i686"; do
     # Android NDK r9d copies a broken unwind.h into the toolchain, see
     # http://crbug.com/357890
     rm -v "${LLVM_BUILD_DIR}"/android-toolchain-${target_arch}/include/c++/*/unwind.h
 
     # Build ASan runtime for Android in a separate build tree.
     mkdir -p ${LLVM_BUILD_DIR}/android-${target_arch}
     pushd ${LLVM_BUILD_DIR}/android-${target_arch}
     rm -fv CMakeCache.txt
-    MACOSX_DEPLOYMENT_TARGET=${deployment_target} cmake -GNinja \
+    cmake -GNinja \
         -DCMAKE_BUILD_TYPE=Release \
         -DLLVM_ENABLE_ASSERTIONS=ON \
         -DLLVM_ENABLE_THREADS=OFF \
         -DCMAKE_C_COMPILER=${PWD}/../bin/clang \
         -DCMAKE_CXX_COMPILER=${PWD}/../bin/clang++ \
         -DLLVM_CONFIG_PATH=${PWD}/../bin/llvm-config \
         -DCMAKE_C_FLAGS="--target=${target_arch}-linux-androideabi --sysroot=${PWD}/../android-toolchain-${target_arch}/sysroot -B${PWD}/../android-toolchain-${target_arch}" \
         -DCMAKE_CXX_FLAGS="--target=${target_arch}-linux-androideabi --sysroot=${PWD}/../android-toolchain-${target_arch}/sysroot -B${PWD}/../android-toolchain-${target_arch}" \
         -DANDROID=1 \
         "${ABS_COMPILER_RT_DIR}"
     ninja libclang_rt.asan-${target_arch}-android.so
 
     # And copy it into the main build tree.
     cp "$(find -name libclang_rt.asan-${target_arch}-android.so)" "${ABS_LLVM_CLANG_LIB_DIR}/lib/linux/"
     popd
   done
 fi
 
 if [[ -n "$run_tests" || -n "${LLVM_FORCE_HEAD_REVISION:-''}" ]]; then
   # Run Chrome tool tests.
   ninja -C "${LLVM_BUILD_DIR}" cr-check-all
 fi
 if [[ -n "$run_tests" ]]; then
   # Run the LLVM and Clang tests.
   ninja -C "${LLVM_BUILD_DIR}" check-all
 fi
 
 # After everything is done, log success for this revision.
 echo "${PACKAGE_VERSION}" > "${STAMP_FILE}"