Fixed cmake config in case of LLVM_ENABLE_RPMALLOC=ON and non MSVC compiler #139770
Conversation
This file contains hidden or 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
|
@llvm/pr-subscribers-llvm-support Author: Dmitry Vasilyev (slydiman) ChangesThis patch fixes the following error in case of LLVM_ENABLE_RPMALLOC=ON and clang or other non MSVC compiler: Note Full diff: https://github.com/llvm/llvm-project/pull/139770.diff 1 Files Affected:
diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
index df1e65f3a588c..a4c6dde6a57ff 100644
--- a/llvm/lib/Support/CMakeLists.txt
+++ b/llvm/lib/Support/CMakeLists.txt
@@ -113,6 +113,7 @@ if(LLVM_INTEGRATED_CRT_ALLOC)
add_compile_definitions(ENABLE_OVERRIDE ENABLE_PRELOAD)
set(ALLOCATOR_FILES "${LLVM_INTEGRATED_CRT_ALLOC}/rpmalloc/rpmalloc.c")
set(delayload_flags "${delayload_flags} ${WL}-INCLUDE:malloc")
+ string(STRIP ${delayload_flags} delayload_flags)
elseif(LLVM_INTEGRATED_CRT_ALLOC MATCHES "snmalloc$")
set(ALLOCATOR_FILES "${LLVM_INTEGRATED_CRT_ALLOC}/src/snmalloc/override/new.cc")
set(system_libs ${system_libs} "mincore.lib" "${WL}-INCLUDE:malloc")
|
…mpiler This patch fixes the following error in case of LLVM_ENABLE_RPMALLOC=ON and clang or other non MSVC compiler ``` CMake Error at cmake/modules/AddLLVM.cmake:644 (add_library): Target "LLVMSupport" links to item " -INCLUDE:malloc" which has leading or trailing whitespace. This is now an error according to policy CMP0004. Call Stack (most recent call first): cmake/modules/AddLLVM.cmake:944 (llvm_add_library) cmake/modules/AddLLVM.cmake:917 (add_llvm_library) lib/Support/CMakeLists.txt:139 (add_llvm_component_library) ``` The behavior is the same with CMake 3.25.3 and 4.0.2
slydiman
force-pushed
the
fix-rpmalloc-non-msvc
branch
from
cdcb1b7 to
ab24e01
Compare
Maetveis
reviewed
May 14, 2025
Maetveis
approved these changes
May 14, 2025
Thanks. I will complete tests with LLVM_ENABLE_RPMALLOC before commit. No rush. |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/136/builds/3932 Here is the relevant piece of the build log for the reference |
It seems the DNS resolver failed on this buildbot. This fail is not related to this patch. |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/146/builds/2937 Here is the relevant piece of the build log for the reference |
lld-x86_64-win seems flaky. This fail is not related to this patch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 patch fixes the following error in case of LLVM_ENABLE_RPMALLOC=ON and clang or other non MSVC compiler:
Note
delayload_flagsis empty before this line is case of non MSVC compiler.The behavior is the same with CMake 3.25.3 and 4.0.2.