[llvm-branch-commits] [libcxx] d02eac0 - [libc++] Fix Docker image build after installing clang-format

[Louis Dionne via llvm-branch-commits]

Author: Louis Dionne
Date: 2020-12-11T14:13:13-05:00
New Revision: d02eac0c000984865dd1ce2474715538f8439470

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

LOG: [libc++] Fix Docker image build after installing clang-format

Added: 
    

Modified: 
    libcxx/utils/ci/Dockerfile

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index c7f8a323b507..6161dd4adefc 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -51,8 +51,8 @@ RUN apt-get update && apt-get install -y libc6-dev-i386 # Required to cross-comp
 # Install the most recently released LLVM
 RUN apt-get update && apt-get install -y lsb-release wget software-properties-common
 RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
-RUN ln -s $(find /usr/bin -regex '.+/clang\+\+-[a-zA-Z0-9.]+') /usr/bin/clang++
-RUN ln -s $(find /usr/bin -regex '.+/clang-[a-zA-Z0-9.]+') /usr/bin/clang
+RUN ln -s $(find /usr/bin -regex '^.+/clang\+\+-[0-9.]+$') /usr/bin/clang++
+RUN ln -s $(find /usr/bin -regex '^.+/clang-[0-9.]+$') /usr/bin/clang
 
 # Install a recent GCC
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test