3rd way of grabbing libc++ headers

tools/clang/scripts/package.sh

 #!/bin/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, and then package the results up
 # to a tgz file.
 
 gcc_toolchain=
 
@@ skipping 33 matching lines @@
   shift
 done
 
 
 THIS_DIR="$(dirname "${0}")"
 LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"
 LLVM_BOOTSTRAP_DIR="${THIS_DIR}/../../../third_party/llvm-bootstrap"
 LLVM_BOOTSTRAP_INSTALL_DIR="${LLVM_DIR}/../llvm-bootstrap-install"
 LLVM_BUILD_DIR="${THIS_DIR}/../../../third_party/llvm-build"
 LLVM_BIN_DIR="${LLVM_BUILD_DIR}/Release+Asserts/bin"
+LLVM_INCLUDE_DIR="${LLVM_BUILD_DIR}/Release+Asserts/include"
 LLVM_LIB_DIR="${LLVM_BUILD_DIR}/Release+Asserts/lib"
 
 echo "Diff in llvm:" | tee buildlog.txt
 svn stat "${LLVM_DIR}" 2>&1 | tee -a buildlog.txt
 svn diff "${LLVM_DIR}" 2>&1 | tee -a buildlog.txt
 echo "Diff in llvm/tools/clang:" | tee -a buildlog.txt
 svn stat "${LLVM_DIR}/tools/clang" 2>&1 | tee -a buildlog.txt
 svn diff "${LLVM_DIR}/tools/clang" 2>&1 | tee -a buildlog.txt
 echo "Diff in llvm/projects/compiler-rt:" | tee -a buildlog.txt
 svn stat "${LLVM_DIR}/projects/compiler-rt" 2>&1 | tee -a buildlog.txt
@@ skipping 35 matching lines @@
 # Copy clang into pdir, symlink clang++ to it.
 cp "${LLVM_BIN_DIR}/clang" $PDIR/bin/
 (cd $PDIR/bin && ln -sf clang clang++)
 cp "${LLVM_BIN_DIR}/llvm-symbolizer" $PDIR/bin/
 if [ "$(uname -s)" = "Darwin" ]; then
   cp "${LLVM_BIN_DIR}/libc++.1.${SO_EXT}" $PDIR/bin/
   (cd $PDIR/bin && ln -sf libc++.1.dylib libc++.dylib)
 fi
 
 # Copy libc++ headers.
-if [ "$(uname -s)" = "Darwin" ]; then
-  mkdir $PDIR/include
-  cp -R "${LLVM_BOOTSTRAP_INSTALL_DIR}/include/c++" $PDIR/include
-fi
+cp -R "${LLVM_INCLUDE_DIR}" $PDIR
 
 # Copy plugins. Some of the dylibs are pretty big, so copy only the ones we
 # care about.
 cp "${LLVM_LIB_DIR}/libFindBadConstructs.${SO_EXT}" $PDIR/lib
 
 BLINKGCPLUGIN_LIBNAME=\
 $(grep LIBRARYNAME "$THIS_DIR"/../blink_gc_plugin/Makefile \
     | cut -d ' ' -f 3)
 cp "${LLVM_LIB_DIR}/lib${BLINKGCPLUGIN_LIBNAME}.${SO_EXT}" $PDIR/lib
 
@@ skipping 39 matching lines @@
 
 if [ "$(uname -s)" = "Darwin" ]; then
   PLATFORM=Mac
 else
   PLATFORM=Linux_x64
 fi
 
 echo To upload, run:
 echo gsutil cp -a public-read $PDIR.tgz \
      gs://chromium-browser-clang/$PLATFORM/$PDIR.tgz