Disable LIBCXX_INCLUDE_BENCHMARKS in Fuchsia cmake #116446
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Caslyn
added
the
libc++
|
@llvm/pr-subscribers-clang @llvm/pr-subscribers-libcxx Author: Caslyn Tonelli (Caslyn) ChangesFull diff: https://github.com/llvm/llvm-project/pull/116446.diff 2 Files Affected:
diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake
index 5af98c7b3b3fba..3318b1b0e17903 100644
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -31,6 +31,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_INCLUDE_BENCHMARKS OFF CACHE BOOL "")
if(WIN32)
set(FUCHSIA_DISABLE_DRIVER_BUILD ON)
diff --git a/clang/cmake/caches/Fuchsia.cmake b/clang/cmake/caches/Fuchsia.cmake
index 2d2dcb9ae6798d..6cfeb564ad24b4 100644
--- a/clang/cmake/caches/Fuchsia.cmake
+++ b/clang/cmake/caches/Fuchsia.cmake
@@ -21,6 +21,7 @@ set(LIBC_HDRGEN_ONLY 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_INCLUDE_BENCHMARKS OFF CACHE BOOL "")
# Passthrough stage1 flags to stage1.
set(_FUCHSIA_BOOTSTRAP_PASSTHROUGH
|
petrhosek
reviewed
Nov 16, 2024
| @@ -31,6 +31,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_INCLUDE_BENCHMARKS OFF CACHE BOOL "") | |||
There was a problem hiding this comment.
This needs to be set for the target, that is line 184 for Linux.
There was a problem hiding this comment.
Thanks - Done. I looked at the pattern of where we set fellow LIBCXX_... macros and made adjustments in in Fuchsia.cmake as well.
There was a problem hiding this comment.
Also - PTAL @ #115361 (comment).
|
Closing - this is resolved by #116644 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This disables
LIBCXX_INCLUDE_BENCHMARKSon Fuchsia-Linux while dubugging Cmake configurations.