diff options
| author | Mark de Wever <koraq@xs4all.nl> | 2023-08-23 21:25:13 +0200 |
|---|---|---|
| committer | Mark de Wever <koraq@xs4all.nl> | 2023-09-05 18:22:10 +0200 |
| commit | 98c6c985f18edde15201676ee2640acf7dc7f55e (patch) | |
| tree | ec8e214af51779adcf1b59d4e8709dcfb4194966 | |
| parent | 6d2e756dacfd9276775a06bdd1fea4eccace5e0f (diff) | |
| download | llvm-98c6c985f18edde15201676ee2640acf7dc7f55e.zip llvm-98c6c985f18edde15201676ee2640acf7dc7f55e.tar.gz llvm-98c6c985f18edde15201676ee2640acf7dc7f55e.tar.bz2 | |
[libc++][C++20 modules] Tests no wchar_t build.
Depends on D158358
Reviewed By: #libc, ldionne
Differential Revision: https://reviews.llvm.org/D158661
| -rw-r--r-- | libcxx/cmake/caches/Generic-no-wide-characters.cmake | 1 | ||||
| -rw-r--r-- | libcxx/modules/std/cstdlib.inc | 2 | ||||
| -rw-r--r-- | libcxx/utils/ci/buildkite-pipeline.yml | 7 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libcxx/cmake/caches/Generic-no-wide-characters.cmake b/libcxx/cmake/caches/Generic-no-wide-characters.cmake index 728d410..5036f6a 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 11c7e86..8840c61 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 5c1010e..b52074e 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" |