[libc][CMake] fix CMake configure issues on openSUSE #79751
Merged
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
|
@llvm/pr-subscribers-libc Author: Sirui Mu (Lancern) Changeslibc cannot be configured on openSUSE because openSUSE toolchain changes the triple format. This PR fixes this issue. Full diff: https://github.com/llvm/llvm-project/pull/79751.diff 1 Files Affected:
diff --git a/libc/cmake/modules/LLVMLibCArchitectures.cmake b/libc/cmake/modules/LLVMLibCArchitectures.cmake
index 10571101a341785..dbd3ea7293b2437 100644
--- a/libc/cmake/modules/LLVMLibCArchitectures.cmake
+++ b/libc/cmake/modules/LLVMLibCArchitectures.cmake
@@ -171,6 +171,11 @@ elseif(LIBC_TARGET_OS STREQUAL "poky")
# include the right directories during compilation.
set(LIBC_TARGET_OS_IS_LINUX TRUE)
set(LIBC_TARGET_OS "linux")
+elseif(LIBC_TARGET_OS STREQUAL "suse")
+ # openSUSE uses different triple format which causes LIBC_TARGET_OS to be
+ # computed as "suse" instead of "linux".
+ set(LIBC_TARGET_OS_IS_LINUX TRUE)
+ set(LIBC_TARGET_OS "linux")
elseif(LIBC_TARGET_OS STREQUAL "darwin")
set(LIBC_TARGET_OS_IS_DARWIN TRUE)
elseif(LIBC_TARGET_OS STREQUAL "windows")
|
jhuber6
reviewed
Jan 28, 2024
| @@ -171,6 +171,11 @@ elseif(LIBC_TARGET_OS STREQUAL "poky") | |||
| # include the right directories during compilation. | |||
| set(LIBC_TARGET_OS_IS_LINUX TRUE) | |||
| set(LIBC_TARGET_OS "linux") | |||
| elseif(LIBC_TARGET_OS STREQUAL "suse") | |||
There was a problem hiding this comment.
We could probably merge this with the poky case above.
jhuber6
approved these changes
Jan 28, 2024
SchrodingerZhu
approved these changes
Jan 28, 2024
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.
libc cannot be configured on openSUSE because openSUSE toolchain changes the triple format. This PR fixes this issue.