3rd way of grabbing libc++ headers

tools/clang/scripts/package.sh

Index: tools/clang/scripts/package.sh
diff --git a/tools/clang/scripts/package.sh b/tools/clang/scripts/package.sh
index 0e05d903599e41c22041005aa87d91a3ff309b48..3f2f23a6ddfa025f8765deb5e643d67be67ab054 100755
--- a/tools/clang/scripts/package.sh
+++ b/tools/clang/scripts/package.sh
@@ -51,6 +51,7 @@ 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
@@ -106,10 +107,7 @@ if [ "$(uname -s)" = "Darwin" ]; then
 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.