[libcxx-commits] [libcxx] 98c6c98 - [libc++][C++20 modules] Tests no wchar_t build.

[Mark de Wever via libcxx-commits]

Author: Mark de Wever
Date: 2023-09-05T18:22:10+02:00
New Revision: 98c6c985f18edde15201676ee2640acf7dc7f55e

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

LOG: [libc++][C++20 modules] Tests no wchar_t build.

Depends on D158358

Reviewed By: #libc, ldionne

Differential Revision: https://reviews.llvm.org/D158661

Added: 
    

Modified: 
    libcxx/cmake/caches/Generic-no-wide-characters.cmake
    libcxx/modules/std/cstdlib.inc
    libcxx/utils/ci/buildkite-pipeline.yml

Removed: 
    


################################################################################
diff  --git a/libcxx/cmake/caches/Generic-no-wide-characters.cmake b/libcxx/cmake/caches/Generic-no-wide-characters.cmake
index 728d41086a38673..5036f6abd52e832 100644
--- a/libcxx/cmake/caches/Generic-no-wide-characters.cmake
+++ b/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 "")

diff  --git a/libcxx/modules/std/cstdlib.inc b/libcxx/modules/std/cstdlib.inc
index 11c7e8670b057c6..8840c61367c30cc 100644
--- a/libcxx/modules/std/cstdlib.inc
+++ b/libcxx/modules/std/cstdlib.inc
@@ -44,8 +44,8 @@ export namespace std {
   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;

diff  --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index 5c1010e81a9c5c9..b52074e5032f049 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -666,8 +666,11 @@ steps:
         - "**/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"