Skip to content

Commit 98c6c98

Browse files
committed
[libc++][C++20 modules] Tests no wchar_t build.
Depends on D158358 Reviewed By: #libc, ldionne Differential Revision: https://reviews.llvm.org/D158661
1 parent 6d2e756 commit 98c6c98

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
set(LIBCXX_ENABLE_STD_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
12
set(LIBCXX_ENABLE_WIDE_CHARACTERS OFF CACHE BOOL "")

libcxx/modules/std/cstdlib.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ export namespace std {
4444
using std::strtoull;
4545

4646
// [c.mb.wcs], multibyte / wide string and character conversion functions
47-
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
4847
using std::mblen;
48+
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
4949
using std::mbstowcs;
5050
using std::mbtowc;
5151
using std::wcstombs;

libcxx/utils/ci/buildkite-pipeline.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,8 +666,11 @@ steps:
666666
- "**/test-results.xml"
667667
- "**/*.abilist"
668668
env:
669-
CC: "clang-${LLVM_HEAD_VERSION}"
670-
CXX: "clang++-${LLVM_HEAD_VERSION}"
669+
# Note: Modules require and absolute path for clang-scan-deps
670+
# https://github.com/llvm/llvm-project/issues/61006
671+
CC: "/usr/lib/llvm-${LLVM_HEAD_VERSION}/bin/clang"
672+
CXX: "/usr/lib/llvm-${LLVM_HEAD_VERSION}/bin/clang++"
673+
CMAKE: "/opt/bin/cmake"
671674
ENABLE_CLANG_TIDY: "On"
672675
agents:
673676
queue: "libcxx-builders"

0 commit comments

Comments
 (0)