Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion clang/test/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
tools = [
"apinotes-test",
"c-index-test",
"cir-opt",
"clang-diff",
"clang-format",
"clang-repl",
Expand Down Expand Up @@ -146,6 +145,9 @@
"clang-ssaf-format",
]

if config.clang_enable_cir:
tools.append("clang-cir")

if config.clang_examples:
config.available_features.add("examples")
if config.llvm_examples:
Expand Down
5 changes: 3 additions & 2 deletions compiler-rt/cmake/Modules/AddCompilerRT.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,7 @@ macro(add_custom_libcxx name prefix)
CMAKE_STRIP
CMAKE_READELF
CMAKE_SYSROOT
CMAKE_INSTALL_MESSAGE
CMAKE_TOOLCHAIN_FILE
LIBCXX_HAS_MUSL_LIBC
LIBCXX_HAS_GCC_S_LIB
Expand Down Expand Up @@ -711,14 +712,14 @@ macro(add_custom_libcxx name prefix)
PREFIX ${prefix}
SOURCE_DIR ${LLVM_MAIN_SRC_DIR}/../runtimes
BINARY_DIR ${prefix}/build
CMAKE_ARGS ${CMAKE_PASSTHROUGH_VARIABLES}
CMAKE_ARGS -DCMAKE_INSTALL_MESSAGE=NEVER
${CMAKE_PASSTHROUGH_VARIABLES}
${compiler_args}
${verbose}
-DCMAKE_C_FLAGS=${LIBCXX_C_FLAGS}
-DCMAKE_CXX_FLAGS=${LIBCXX_CXX_FLAGS}
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_INSTALL_MESSAGE=LAZY
-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY
-DLLVM_ENABLE_RUNTIMES=libcxx|libcxxabi
-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
Expand Down
4 changes: 2 additions & 2 deletions libcxx/utils/libcxx/test/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def configure(parameters, features, config, lit_config):

# Print the basic substitutions
for sub in ("%{cxx}", "%{flags}", "%{compile_flags}", "%{link_flags}", "%{benchmark_flags}", "%{exec}"):
note("Using {} substitution: '{}'".format(sub, _getSubstitution(sub, config.substitutions)))
debug("Using {} substitution: '{}'".format(sub, _getSubstitution(sub, config.substitutions)))

# Print all available features
note("All available features: {}".format(", ".join(sorted(config.available_features))))
debug("All available features: {}".format(", ".join(sorted(config.available_features))))
4 changes: 1 addition & 3 deletions llvm/utils/lit/lit/llvm/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,6 @@ def use_llvm_tool(
name,
search_env=None,
required=False,
quiet=False,
search_paths=None,
use_installed=False,
):
Expand Down Expand Up @@ -565,8 +564,7 @@ def use_llvm_tool(
self.lit_config.params.get("use_normalized_slashes")
):
tool = tool.replace("\\", "/")
if not quiet:
self.lit_config.note("using {}: {}".format(name, tool))
self.lit_config.dbg("using {}: {}".format(name, tool))
return tool

def _get_clang_paths(self, additional_tool_dirs):
Expand Down
Loading