Revert "Roll Clang 214024:216630 (+216684) and switch to CMake (try 2)"

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 afa43bd55a99ec79f5d2a2bd59af09f28264da0d..2e81346ddd273447230c3096e5dcea8e94a35392 100755
--- a/tools/clang/scripts/package.sh
+++ b/tools/clang/scripts/package.sh
@@ -59,16 +59,9 @@ 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/compiler-rt:" | tee -a buildlog.txt
-svn stat "${LLVM_DIR}/compiler-rt" 2>&1 | tee -a buildlog.txt
-svn diff "${LLVM_DIR}/compiler-rt" 2>&1 | tee -a buildlog.txt
-echo "Diff in llvm/projects/libcxx:" | tee -a buildlog.txt
-svn stat "${LLVM_DIR}/projects/libcxx" 2>&1 | tee -a buildlog.txt
-svn diff "${LLVM_DIR}/projects/libcxx" 2>&1 | tee -a buildlog.txt
-echo "Diff in llvm/projects/libcxxabi:" | tee -a buildlog.txt
-svn stat "${LLVM_DIR}/projects/libcxxabi" 2>&1 | tee -a buildlog.txt
-svn diff "${LLVM_DIR}/projects/libcxxabi" 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
+svn diff "${LLVM_DIR}/projects/compiler-rt" 2>&1 | tee -a buildlog.txt
 
 echo "Starting build" | tee -a buildlog.txt
 
@@ -86,7 +79,7 @@ fi
     ${extra_flags} 2>&1 | tee -a buildlog.txt
 
 R=$("${LLVM_BIN_DIR}/clang" --version | \
-     sed -ne 's/clang version .*(\([0-9]*\))/\1/p')
+     sed -ne 's/clang version .*(trunk \([0-9]*\))/\1/p')
 
 PDIR=clang-$R
 rm -rf $PDIR
@@ -123,8 +116,8 @@ fi
 cp "${LLVM_LIB_DIR}/libFindBadConstructs.${SO_EXT}" $PDIR/lib
 
 BLINKGCPLUGIN_LIBNAME=\
-$(grep 'set(LIBRARYNAME' "$THIS_DIR"/../blink_gc_plugin/CMakeLists.txt \
-    | cut -d ' ' -f 2 | tr -d ')')
+$(grep LIBRARYNAME "$THIS_DIR"/../blink_gc_plugin/Makefile \
+    | cut -d ' ' -f 3)
 cp "${LLVM_LIB_DIR}/lib${BLINKGCPLUGIN_LIBNAME}.${SO_EXT}" $PDIR/lib
 
 if [[ -n "${gcc_toolchain}" ]]; then
@@ -133,7 +126,7 @@ if [[ -n "${gcc_toolchain}" ]]; then
 fi
 
 # Copy built-in headers (lib/clang/3.x.y/include).
-# compiler-rt builds all kinds of libraries, but we want only some.
+# libcompiler-rt puts all kinds of libraries there too, but we want only some.
 if [ "$(uname -s)" = "Darwin" ]; then
   # Keep only the OSX (ASan and profile) and iossim (ASan) runtime libraries:
   # Release+Asserts/lib/clang/*/lib/darwin/libclang_rt.{asan,profile}_*
@@ -151,7 +144,6 @@ if [ "$(uname -s)" = "Darwin" ]; then
     ASAN_DYLIB=$(find "${LLVM_LIB_DIR}/clang" \
                       -type f -path "*${ASAN_DYLIB_NAME}")
     install_name_tool -id @executable_path/${ASAN_DYLIB_NAME} "${ASAN_DYLIB}"
-    strip -x "${ASAN_DYLIB}"
   done
 else
   # Keep only
@@ -159,12 +151,12 @@ else
   # , but not dfsan.
   find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/linux*' \
        ! -name '*[atm]san*' ! -name '*ubsan*' ! -name '*libclang_rt.san*' \
-       ! -name '*profile*' | xargs rm -v
+       ! -name '*profile*' | xargs rm
   # Strip the debug info from the runtime libraries.
-  find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/linux*' ! -name '*.syms' | xargs strip -g
+  find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/linux*' | xargs strip -g
 fi
 
-cp -vR "${LLVM_LIB_DIR}/clang" $PDIR/lib
+cp -R "${LLVM_LIB_DIR}/clang" $PDIR/lib
 
 if [ "$(uname -s)" = "Darwin" ]; then
   tar zcf $PDIR.tgz -C $PDIR bin include lib buildlog.txt