diff options
| author | Kefu Chai <kefu.chai@scylladb.com> | 2023-02-15 04:52:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-02-15 19:40:11 (GMT) |
| commit | 65ff605e44ef7e59a510de6c2d9b5e1615c8981f (patch) | |
| tree | 67873987c409e85a27fc76d2aaa8119ff99043b8 | |
| parent | 037975ef69a0e889f9c17e5e6e6fb87111dfd9df (diff) | |
| download | CMake-65ff605e44ef7e59a510de6c2d9b5e1615c8981f.zip CMake-65ff605e44ef7e59a510de6c2d9b5e1615c8981f.tar.gz CMake-65ff605e44ef7e59a510de6c2d9b5e1615c8981f.tar.bz2 | |
ci: use the latest clang-scan-deps options
P1689 support has been merged in Clang trunk and Clang 16 branch, so we
are now able to use the finalized clang-scan-deps command line options.
See also llvm-project's clang/test/ClangScanDeps/P1689.cppm [1] for the
samples of clang-scan-deps usages.
[1] https://github.com/llvm/llvm-project/blob/6d859df46e/clang/test/ClangScanDeps/P1689.cppm
Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>
| -rw-r--r-- | .gitlab/ci/cxx_modules_rules_clang.cmake | 9 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/clang_cxx_modules/install_llvm.sh | 4 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/.gitlab/ci/cxx_modules_rules_clang.cmake b/.gitlab/ci/cxx_modules_rules_clang.cmake index 4b80aab..fcb2281 100644 --- a/.gitlab/ci/cxx_modules_rules_clang.cmake +++ b/.gitlab/ci/cxx_modules_rules_clang.cmake @@ -3,11 +3,12 @@ set(CMake_TEST_CXXModules_UUID "a246741c-d067-4019-a8fb-3d16b0c9d1d3") set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1) string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "${CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS}" - " -format=p1689 --p1689-targeted-file-name=<SOURCE> --p1689-targeted-output=<OBJECT> " - " --p1689-makeformat-output=<DEP_FILE>" + " -format=p1689" " --" - " <DEFINES> <INCLUDES> <FLAGS> -x c++ <SOURCE>" - " -MT <DYNDEP_FILE> -MD" + " <CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS>" + " -x c++ <SOURCE> -c -o <OBJECT>" + " -MT <DYNDEP_FILE>" + " -MD -MF <DEP_FILE>" " > <DYNDEP_FILE>") set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FORMAT "clang") set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FLAG "@<MODULE_MAP_FILE>") diff --git a/.gitlab/ci/docker/clang_cxx_modules/install_llvm.sh b/.gitlab/ci/docker/clang_cxx_modules/install_llvm.sh index 025f8a2..35f925e 100755 --- a/.gitlab/ci/docker/clang_cxx_modules/install_llvm.sh +++ b/.gitlab/ci/docker/clang_cxx_modules/install_llvm.sh @@ -2,8 +2,8 @@ set -e -readonly revision="p1689r5-cmake-ci-20221215" # a0acf2c9285e848b65ec7336e185888163949490 -readonly tarball="https://github.com/mathstuf/llvm-project/archive/$revision.tar.gz" +readonly revision="6d859df46e93e04bd7a4f90d9a9056763998f638" # llvmorg-16.0.0-rc2-31-g6d859df46e93 +readonly tarball="https://github.com/llvm/llvm-project/archive/$revision.tar.gz" readonly workdir="$HOME/llvm" readonly srcdir="$workdir/llvm" diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 8ab3fad..9a53401 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -377,7 +377,7 @@ CMAKE_GENERATOR: "Ninja Multi-Config" .clang_cxx_modules_x86_64: - image: "kitware/cmake:ci-clang_cxx_modules-x86_64-2022-12-15" + image: "kitware/cmake:ci-clang_cxx_modules-x86_64-2023-02-15" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" |