Skip to content

[libc++] Remove unused CMake option LIBCXX_DISABLE_MACRO_CONFLICT_WARNINGS #66249

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

Merged
merged 1 commit into from
Sep 13, 2023

Conversation

ldionne
Copy link
Member

@ldionne ldionne commented Sep 13, 2023

Thanks @Gadal for noticing.

Fixes #63703

@ldionne ldionne requested a review from a team as a code owner September 13, 2023 17:07
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Sep 13, 2023
@llvmbot
Copy link
Member

llvmbot commented Sep 13, 2023

@llvm/pr-subscribers-libcxx

Changes Thanks @Gadal for noticing.

Fixes #63703

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

1 Files Affected:

  • (modified) libcxx/CMakeLists.txt (-1)
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index c0f281043c2b494..bb2898b799bcef9 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -302,7 +302,6 @@ endif()
 # about #include_next which is used everywhere.
 option(LIBCXX_ENABLE_PEDANTIC "Compile with pedantic enabled." OFF)
 option(LIBCXX_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF)
-option(LIBCXX_DISABLE_MACRO_CONFLICT_WARNINGS "Disable #warnings about conflicting macros." OFF)
 
 option(LIBCXX_GENERATE_COVERAGE "Enable generating code coverage." OFF)
 set(LIBCXX_COVERAGE_LIBRARY "" CACHE STRING

@ldionne ldionne merged commit 008bd84 into llvm:main Sep 13, 2023
@ldionne ldionne deleted the review/remove-unused-cmake-option branch September 13, 2023 20:05
ZijunZhaoCCK pushed a commit to ZijunZhaoCCK/llvm-project that referenced this pull request Sep 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unused libcxx CMake option LIBCXX_DISABLE_MACRO_CONFLICT_WARNINGS
2 participants