libc/cmake: don't fail if LLVM_VERSION_SUFFIX isn't defined #126359
Merged
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-libc Author: Sylvestre Ledru (sylvestre) ChangesCloses: #126358 cc @samvangysegem Full diff: https://github.com/llvm/llvm-project/pull/126359.diff 1 Files Affected:
diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
index 1c4c0cd5aa22ba..d44769721c918f 100644
--- a/libc/CMakeLists.txt
+++ b/libc/CMakeLists.txt
@@ -51,7 +51,11 @@ set(LIBC_KERNEL_HEADERS "/usr/include" CACHE STRING "Path to Linux kernel header
# Defining a global namespace to enclose all libc functions.
set(default_namespace "__llvm_libc")
if(LLVM_VERSION_MAJOR)
- string(REPLACE "-" "" NS_LLVM_VERSION_SUFFIX ${LLVM_VERSION_SUFFIX})
+ if(DEFINED LLVM_VERSION_SUFFIX AND NOT "${LLVM_VERSION_SUFFIX}" STREQUAL "")
+ string(REPLACE "-" "" NS_LLVM_VERSION_SUFFIX "${LLVM_VERSION_SUFFIX}")
+ else()
+ set(NS_LLVM_VERSION_SUFFIX "")
+ endif()
set(default_namespace "__llvm_libc_${LLVM_VERSION_MAJOR}_${LLVM_VERSION_MINOR}_${LLVM_VERSION_PATCH}_${NS_LLVM_VERSION_SUFFIX}")
endif()
set(LIBC_NAMESPACE ${default_namespace}
|
jhuber6
reviewed
Feb 9, 2025
|
Thanks @sylvestre for the patch! Sorry I missed that this would be an issue in my review of #126193. Note: that got backported to release/20.x, so this will need to be backported as well. As such, I'll tag #126358 as a release blocker. Sorry for the mess; or rather thank you for cleaning up my mess! |
jhuber6
approved these changes
Feb 13, 2025
|
sorry for the latency, crazy week |
|
/cherry-pick c81139f |
|
/pull-request #127099 |
joaosaffran
pushed a commit
to joaosaffran/llvm-project
that referenced
this pull request
Feb 14, 2025
) Closes: llvm#126358 cc @samvangysegem --------- Co-authored-by: Joseph Huber <[email protected]>
swift-ci
pushed a commit
to swiftlang/llvm-project
that referenced
this pull request
Feb 14, 2025
) Closes: llvm#126358 cc @samvangysegem --------- Co-authored-by: Joseph Huber <[email protected]> (cherry picked from commit c81139f)
sivan-shani
pushed a commit
to sivan-shani/llvm-project
that referenced
this pull request
Feb 24, 2025
) Closes: llvm#126358 cc @samvangysegem --------- Co-authored-by: Joseph Huber <[email protected]>
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.
Closes: #126358
cc @samvangysegem