Backout changeset b0abf5269c25 (bug 1492037) to give time to toolchains to build without blocking other landings.

build/build-clang/build-clang.py

@@ -222,9 +222,6 @@ def build_one_stage(cc, cxx, asm, ld, ar, ranlib, libtool,
         if is_windows():
             cmake_args.insert(-1, "-DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON")
             cmake_args.insert(-1, "-DLLVM_USE_CRT_RELEASE=MT")
-        else:
-            # libllvm as a shared library is not supported on Windows
-            cmake_args += ["-DLLVM_LINK_LLVM_DYLIB=ON"]
         if ranlib is not None:
             cmake_args += ["-DCMAKE_RANLIB=%s" % slashify_path(ranlib)]
         if libtool is not None:

build/build-clang/clang-3.9-linux64.json

@@ -15,7 +15,6 @@
     "cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
     "as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
     "patches": [
-      "static-llvm-symbolizer.patch",
       "llvm-debug-frame.patch",
       "r277806.patch",
       "r285657.patch",

build/build-clang/clang-6-linux64.json

@@ -16,7 +16,6 @@
     "cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
     "as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
     "patches": [
-      "static-llvm-symbolizer.patch",
       "find_symbolizer_linux.patch",
       "r322325.patch",
       "r322401.patch",

build/build-clang/clang-6-macosx64.json

@@ -21,7 +21,6 @@
     "libtool": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-libtool",
     "ld": "/builds/worker/workspace/build/src/clang/bin/clang",
     "patches": [
-      "static-llvm-symbolizer.patch",
       "compiler-rt-cross-compile.patch",
       "compiler-rt-no-codesign.patch",
       "r322401.patch",

build/build-clang/clang-7-pre-linux64.json

@@ -16,7 +16,6 @@
     "cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
     "as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
     "patches": [
-      "static-llvm-symbolizer.patch",
       "find_symbolizer_linux.patch",
       "rename_gcov_flush.patch"
     ]

build/build-clang/static-llvm-symbolizer.patch

@@ -1,12 +0,0 @@
-diff --git a/llvm/tools/llvm-symbolizer/CMakeLists.txt b/llvm/tools/llvm-symbolizer/CMakeLists.txt
-index 8185c296c50..13c7419fa47 100644
---- a/llvm/tools/llvm-symbolizer/CMakeLists.txt
-+++ b/llvm/tools/llvm-symbolizer/CMakeLists.txt
-@@ -13,6 +13,7 @@ set(LLVM_LINK_COMPONENTS
-   )
- 
- add_llvm_tool(llvm-symbolizer
-+  DISABLE_LLVM_LINK_LLVM_DYLIB
-   llvm-symbolizer.cpp
-   )
- 

taskcluster/scripts/misc/build-cctools-port-macosx.sh

@@ -1,9 +1,4 @@
 #!/bin/bash
-
-# cctools sometimes needs to be rebuilt when clang is modified.
-# Until bug 1471905 is addressed, increase the following number
-# when a forced rebuild of cctools is necessary: 1
-
 set -x -e -v
 
 # This script is for building cctools (Apple's binutils) for Mac OS X on

taskcluster/scripts/misc/build-cctools-port.sh

@@ -1,9 +1,4 @@
 #!/bin/bash
-
-# cctools sometimes needs to be rebuilt when clang is modified.
-# Until bug 1471905 is addressed, increase the following number
-# when a forced rebuild of cctools is necessary: 1
-
 set -x -e -v
 
 # This script is for building cctools (Apple's binutils) for Linux using