[libcxx-commits] [libcxx] 85cce4d - [libc++] Test on Clang ToT by default

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2021-07-12T11:13:43-04:00
New Revision: 85cce4d4858945aa2f3ed3e20b29dcfcd8e51b2d

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

LOG: [libc++] Test on Clang ToT by default

This is what ffccf96e90d6b should have enabled, however the symlink
in the Docker image was not pointing to the right compiler, so we were
testing with Clang 12 instead of ToT.

Added: 
    

Modified: 
    libcxx/utils/ci/Dockerfile

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index aeb1d2f24952e..8ddd2cec584ad 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -47,9 +47,9 @@ RUN bash /tmp/llvm.sh $(($LLVM_LATEST_VERSION - 1)) # previous release
 RUN bash /tmp/llvm.sh $LLVM_LATEST_VERSION          # latest release
 RUN bash /tmp/llvm.sh $(($LLVM_LATEST_VERSION + 1)) # current ToT
 
-# Make the latest Clang the "default" compiler on the system
-RUN ln -fs /usr/bin/clang++-$LLVM_LATEST_VERSION /usr/bin/c++ && [ -e $(readlink /usr/bin/c++) ]
-RUN ln -fs /usr/bin/clang-$LLVM_LATEST_VERSION /usr/bin/cc && [ -e $(readlink /usr/bin/cc) ]
+# Make the ToT Clang the "default" compiler on the system
+RUN ln -fs /usr/bin/clang++-$(($LLVM_LATEST_VERSION + 1)) /usr/bin/c++ && [ -e $(readlink /usr/bin/c++) ]
+RUN ln -fs /usr/bin/clang-$(($LLVM_LATEST_VERSION + 1)) /usr/bin/cc && [ -e $(readlink /usr/bin/cc) ]
 
 # Temporarily keep the clang++ and clang++-tot symlinks around for backwards compatibility with builders
 RUN ln -s /usr/bin/clang++-$LLVM_LATEST_VERSION /usr/bin/clang++ && [ -e $(readlink /usr/bin/clang++) ]