From c90c5e0bafd24733e2fd206a6b711136a12c04fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Andr=C3=A9-Chang?= Date: Sat, 22 Feb 2020 14:52:47 +0000 Subject: [PATCH 1/2] Install clang-format --- images/linux/scripts/installers/clang.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 0a7f2252f22f..4d3373c9a840 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -18,6 +18,7 @@ function InstallClang { apt-get install -y "clang-$version" "lldb-$version" "lld-$version" else ./llvm.sh $version + apt-get install -y "clang-format-$version" fi # Run tests to determine that the software installed as expected From db34108d0693695663d2eecfec8d6166aa18fb70 Mon Sep 17 00:00:00 2001 From: Nils Date: Fri, 6 Mar 2020 10:56:17 +0000 Subject: [PATCH 2/2] Make `clang-format-9` the default `clang-format` --- images/linux/scripts/installers/clang.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 4d3373c9a840..1ca4cde2c4eb 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -60,3 +60,4 @@ rm llvm.sh # Make Clang 9 default update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 100 update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 100 +update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-9 100