[libcxx-commits] [PATCH] D158661: [libc++][C++20 modules] Tests no wchar_t build.

[Mark de Wever via Phabricator via libcxx-commits]

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

Depends on D158358 <https://reviews.llvm.org/D158358>


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D158661

Files:
  libcxx/cmake/caches/Generic-no-wide-characters.cmake
  libcxx/modules/std/cstdlib.inc
  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
@@ -666,8 +666,11 @@
         - "**/test-results.xml"
         - "**/*.abilist"
       env:
-          CC: "clang-${LLVM_HEAD_VERSION}"
-          CXX: "clang++-${LLVM_HEAD_VERSION}"
+          # Note: Modules require and absolute path for clang-scan-deps
+          # 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/modules/std/cstdlib.inc
===================================================================
--- libcxx/modules/std/cstdlib.inc
+++ libcxx/modules/std/cstdlib.inc
@@ -44,8 +44,8 @@
   using std::strtoull;
 
   // [c.mb.wcs], multibyte / wide string and character conversion functions
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
   using std::mblen;
+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
   using std::mbstowcs;
   using std::mbtowc;
   using std::wcstombs;
Index: libcxx/cmake/caches/Generic-no-wide-characters.cmake
===================================================================
--- libcxx/cmake/caches/Generic-no-wide-characters.cmake
+++ libcxx/cmake/caches/Generic-no-wide-characters.cmake
@@ -1 +1,2 @@
+set(LIBCXX_ENABLE_STD_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
 set(LIBCXX_ENABLE_WIDE_CHARACTERS OFF CACHE BOOL "")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D158661.552847.patch
Type: text/x-patch
Size: 1642 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230823/6c38198e/attachment.bin>