[clang] b4ffc40 - Update documentation and implementation of stage3 build

[via cfe-commits]

Author: Serge Guelton
Date: 2020-10-08T07:55:37+02:00
New Revision: b4ffc40d622bb2647852284c78c5e83346f2d630

URL: https://github.com/llvm/llvm-project/commit/b4ffc40d622bb2647852284c78c5e83346f2d630
DIFF: https://github.com/llvm/llvm-project/commit/b4ffc40d622bb2647852284c78c5e83346f2d630.diff

LOG: Update documentation and implementation of stage3 build

Have the build work out of the box by forcing an LLD build.

That way, we don't require an external LTO-aware linker,
as we build one.

Also remove reference to the seemingly dead builder.

Differential Revision: https://reviews.llvm.org/D88990

Added: 
    

Modified: 
    clang/cmake/caches/3-stage-base.cmake
    llvm/docs/AdvancedBuilds.rst

Removed: 
    


################################################################################
diff  --git a/clang/cmake/caches/3-stage-base.cmake b/clang/cmake/caches/3-stage-base.cmake
index 46c747edd778..88ab5d77f16f 100644
--- a/clang/cmake/caches/3-stage-base.cmake
+++ b/clang/cmake/caches/3-stage-base.cmake
@@ -3,6 +3,15 @@ set(CLANG_ENABLE_BOOTSTRAP ON CACHE BOOL "")
 set(LLVM_BUILD_EXTERNAL_COMPILER_RT ON CACHE BOOL "")
 set(BOOTSTRAP_LLVM_ENABLE_LTO ON CACHE BOOL "")
 
+# Use LLD do have less requirements on system linker, unless we're on an apple
+# platform where the system compiler is to be prefered.
+if(APPLE)
+    set(BOOTSTRAP_LLVM_ENABLE_LLD OFF CACHE BOOL "")
+else()
+    set(BOOTSTRAP_LLVM_ENABLE_LLD ON CACHE BOOL "")
+endif()
+
+
 set(CLANG_BOOTSTRAP_TARGETS
   clang
   check-all

diff  --git a/llvm/docs/AdvancedBuilds.rst b/llvm/docs/AdvancedBuilds.rst
index 695dcfb62a1f..1781726741f2 100644
--- a/llvm/docs/AdvancedBuilds.rst
+++ b/llvm/docs/AdvancedBuilds.rst
@@ -186,8 +186,6 @@ following commands:
 .. code-block:: console
 
   $ cmake -G Ninja -C <path_to_clang>/cmake/caches/3-stage.cmake <source dir>
-  $ ninja stage3
+  $ cmake --build . --target stage3 --parallel
 
-After the build you can compare the stage2 & stage3 compilers. We have a bot
-setup `here <http://lab.llvm.org:8011/builders/clang-3stage-ubuntu>`_ that runs
-this build and compare configuration.
+After the build you can compare the stage2 & stage3 compilers.