[libcxx-commits] [PATCH] D159065: [libc++][hardening] Make the safe mode pipeline run with modules enabled

[Konstantin Varlamov via Phabricator via libcxx-commits]

var-const created this revision.
Herald added a subscriber: arichardson.
Herald added a project: All.
var-const requested review of this revision.
Herald added a project: libc++.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D159065

Files:
  libcxx/cmake/caches/Generic-safe-mode.cmake
  libcxx/utils/ci/buildkite-pipeline.yml


Index: libcxx/utils/ci/buildkite-pipeline.yml
===================================================================
--- libcxx/utils/ci/buildkite-pipeline.yml
+++ libcxx/utils/ci/buildkite-pipeline.yml
@@ -501,8 +501,11 @@
       - "**/test-results.xml"
       - "**/*.abilist"
     env:
-        CC: "clang-${LLVM_HEAD_VERSION}"
-        CXX: "clang++-${LLVM_HEAD_VERSION}"
+        # Note: Modules require an absolute path for `clang-scan-deps` (see
+        # https://github.com/llvm/llvm-project/issues/61006).
+        CC: "/usr/lib/llvm-${LLVM_HEAD_VERSION}/bin/clang"
+        CXX: "/usr/lib/llvm-${LLVM_HEAD_VERSION}/bin/clang++"
+        CMAKE: "/opt/bin/cmake"
         ENABLE_CLANG_TIDY: "On"
     agents:
       queue: "libcxx-builders"
Index: libcxx/cmake/caches/Generic-safe-mode.cmake
===================================================================
--- libcxx/cmake/caches/Generic-safe-mode.cmake
+++ libcxx/cmake/caches/Generic-safe-mode.cmake
@@ -1 +1,2 @@
+set(LIBCXX_ENABLE_STD_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
 set(LIBCXX_HARDENING_MODE "safe" CACHE STRING "")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D159065.554180.patch
Type: text/x-patch
Size: 1126 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230829/f2967c28/attachment.bin>