Skip to content

[Fuchsia] Explicitly set C++ standard C++23 in libcxx tests #73760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

zeroomega
Copy link
Contributor

This patch explicitly set C++23 in libcxx tests to avoid a test breakage caused by removal of codecvt.

@zeroomega zeroomega requested a review from petrhosek November 29, 2023 08:03
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Nov 29, 2023
@llvmbot
Copy link
Member

llvmbot commented Nov 29, 2023

@llvm/pr-subscribers-clang

Author: Haowei (zeroomega)

Changes

This patch explicitly set C++23 in libcxx tests to avoid a test breakage caused by removal of codecvt.


Full diff: https://github.com/llvm/llvm-project/pull/73760.diff

1 Files Affected:

  • (modified) clang/cmake/caches/Fuchsia-stage2.cmake (+1)
diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake
index 4b9085d99378c6f..57761ef194976bd 100644
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -28,6 +28,7 @@ set(LLVM_STATIC_LINK_CXX_STDLIB ON CACHE BOOL "")
 set(LLVM_USE_RELATIVE_PATHS_IN_FILES ON CACHE BOOL "")
 set(LLDB_ENABLE_CURSES OFF CACHE BOOL "")
 set(LLDB_ENABLE_LIBEDIT OFF CACHE BOOL "")
+set(LIBCXX_TEST_PARAMS "std=c++23" CACHE STRING "")
 
 if(WIN32)
   set(FUCHSIA_DISABLE_DRIVER_BUILD ON)

@zeroomega
Copy link
Contributor Author

We still need PR #73679 landed to clear build failures though.

This patch explicitly set C++23 in libcxx tests to avoid a test
breakage caused by removal of codecvt.
@@ -136,6 +136,7 @@ if(WIN32 OR LLVM_WINSYSROOT)
set(RUNTIMES_${target}_CMAKE_EXE_LINKER_FLAGS ${WINDOWS_LINK_FLAGS} CACHE STRING "")
set(RUNTIMES_${target}_CMAKE_SHARED_LINKER_FLAGS ${WINDOWS_LINK_FLAGS} CACHE STRING "")
set(RUNTIMES_${target}_CMAKE_MODULE_LINKER_FLAGS ${WINDOWS_LINK_FLAGS} CACHE STRING "")
set(RUNTIMES_${target}_LIBCXX_TEST_PARAMS "std=c++23" CACHE STRING "")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a nit, but can you move this next to the other *_LIBCXX_* flags in this block?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants