From 3f8a49843d603dbd4bc10f9eba509f303324efe5 Mon Sep 17 00:00:00 2001 From: Tim van der Lippe Date: Tue, 3 Mar 2020 12:31:24 +0000 Subject: [PATCH] Update clang-format build instructions for Linux Clang-format is now part of the GitHub repository at https://github.com/llvm/llvm-project/tree/master/clang and requires the `clang` project to be enabled in the cmake command. R=hans@chromium.org Bug: 993206 Change-Id: I6527fd41050550f979836b76b5b86cda2dd36d95 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2081425 Commit-Queue: Tim van der Lippe Reviewed-by: Hans Wennborg Cr-Commit-Position: refs/heads/master@{#746334} --- docs/updating_clang_format_binaries.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/docs/updating_clang_format_binaries.md b/docs/updating_clang_format_binaries.md index 5fe56d35f40455..dd409089f1acfb 100644 --- a/docs/updating_clang_format_binaries.md +++ b/docs/updating_clang_format_binaries.md @@ -54,15 +54,12 @@ Mac & Linux step-by-step: ```shell # Check out. -export CLANG_REV=198831 # You must change this value (see above) -rm -rf llvm -rm -rf llvm-build -mkdir llvm -mkdir llvm-build -svn co http://llvm.org/svn/llvm-project/llvm/trunk@$CLANG_REV llvm -cd llvm/tools -svn co http://llvm.org/svn/llvm-project/cfe/trunk@$CLANG_REV clang -cd ../../llvm-build +export CLANG_REV=56ac9d30d35632969baa39829ebc8465ed5937ef # You must change this value (see above) +git clone https://github.com/llvm/llvm-project +cd llvm-project +git checkout $CLANG_REV +mkdir build +cd build # On Mac, do the following: MACOSX_DEPLOYMENT_TARGET=10.9 cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ @@ -70,12 +67,14 @@ MACOSX_DEPLOYMENT_TARGET=10.9 cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ time caffeinate ninja clang-format strip bin/clang-format -#On Linux, do the following: +# On Linux, do the following: +# Note the relative paths that point to your local Chromium checkout. cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_ENABLE_PROJECTS=clang \ -DLLVM_ENABLE_ASSERTIONS=NO -DLLVM_ENABLE_THREADS=NO \ - -DCMAKE_C_COMPILER=$PWD/../chrome/src/third_party/llvm-build/Release+Asserts/bin/clang \ - -DCMAKE_CXX_COMPILER=$PWD/../chrome/src/third_party/llvm-build/Release+Asserts/bin/clang++ \ - -DCMAKE_ASM_COMPILER=$PWD/../chrome/src/third_party/llvm-build/Release+Asserts/bin/clang \ + -DCMAKE_C_COMPILER=$PWD/../../chromium/src/third_party/llvm-build/Release+Asserts/bin/clang \ + -DCMAKE_CXX_COMPILER=$PWD/../../chromium/src/third_party/llvm-build/Release+Asserts/bin/clang++ \ + -DCMAKE_ASM_COMPILER=$PWD/../../chromium/src/third_party/llvm-build/Release+Asserts/bin/clang \ -DLLVM_ENABLE_TERMINFO=OFF -DCMAKE_CXX_STANDARD_LIBRARIES="-static-libgcc -static-libstdc++" ../llvm/ ninja clang-format strip bin/clang-format