[llvm] 5877df7 - [Support/BLAKE3] CMake: Remove the workaround that checks for "CC=ccache /path/to/clang"
Argyrios Kyrtzidis via llvm-commits
llvm-commits at lists.llvm.org
Sun Apr 3 21:04:38 PDT 2022
Author: Argyrios Kyrtzidis
Date: 2022-04-03T21:02:02-07:00
New Revision: 5877df735d2dc74c5f624d39718d52677171403a
URL: https://github.com/llvm/llvm-project/commit/5877df735d2dc74c5f624d39718d52677171403a
DIFF: https://github.com/llvm/llvm-project/commit/5877df735d2dc74c5f624d39718d52677171403a.diff
LOG: [Support/BLAKE3] CMake: Remove the workaround that checks for "CC=ccache /path/to/clang"
The LLVM builders that were doing that have been updated to use "-DLLVM_CCACHE_BUILD=ON" instead.
Added:
Modified:
llvm/lib/Support/BLAKE3/CMakeLists.txt
Removed:
################################################################################
diff --git a/llvm/lib/Support/BLAKE3/CMakeLists.txt b/llvm/lib/Support/BLAKE3/CMakeLists.txt
index 1ffbe9ab14c94..5423e0ed689e2 100644
--- a/llvm/lib/Support/BLAKE3/CMakeLists.txt
+++ b/llvm/lib/Support/BLAKE3/CMakeLists.txt
@@ -10,22 +10,6 @@ else()
set(CAN_USE_ASSEMBLER TRUE)
endif()
-# Some LLVM builders set "CC=ccache /path/to/clang" as environment variable,
-# which confuses CMake thinking the assembler to use is the 'ccache' binary.
-# These builders need to also set "ASM=/path/to/clang" in environment, or use
-# LLVM_CCACHE_BUILD CMake variable instead, but until this happens check for
-# this case and disable building the assembly files.
-get_filename_component(ASM_BINARY ${CMAKE_ASM_COMPILER} NAME)
-if (ASM_BINARY STREQUAL "ccache")
- message(WARNING "CMake is set to use '${CMAKE_ASM_COMPILER}' as assembler "
- "which is likely due to having 'CC=ccache /path/to/clang' in the environment. "
- "Building the BLAKE3 SIMD-optimized assembly files is disabled, set "
- "'ASM=/path/to/clang' as environment variable and do a clean re-configure, "
- "or unset CC/CXX and configure with '-DLLVM_CCACHE_BUILD=YES' instead, "
- "to correct this.")
- set(CAN_USE_ASSEMBLER FALSE)
-endif()
-
# The BLAKE3 team recommends using the assembly versions, from the README:
#
# "For each of the x86 SIMD instruction sets, four versions are available:
More information about the llvm-commits
mailing list