CMake: Improve default value of COMPILER_RT_LIBDIR_OS on non-Mac Posix #4903
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
kinke
force-pushed
the
cmake_compiler-rt_default
branch
2 times, most recently
from
dd4e1c0 to
3a851d6
Compare
kinke
commented
Apr 11, 2025
.github/workflows/main.yml
Outdated
| arch: armv7a | ||
| android_x86_arch: i686 | ||
| extra_cmake_flags: >- | ||
| -DCOMPILER_RT_LIBDIR_OS=linux |
Member
Author
There was a problem hiding this comment.
Our Android LLVM binaries have been cross-compiled on Linux, so not sure if it should always be linux (not android) on Android in general (as CMake special case), or whether this is just a side-effect of cross-compiling LLVM incl. compiler-rt.
Contributor
There was a problem hiding this comment.
Using linux for android is intended, cross-compiling notwithstanding https://github.com/llvm/llvm-project/blob/5c8ba28c751bf0e7cb5c3ac9d223acba4cefc739/compiler-rt/cmake/base-config-ix.cmake#L98-L102
Member
Author
There was a problem hiding this comment.
Ah nice, thx for checking!
By preferring the LLVM host target triple (instead of hardcoding a Linux x86_64 glibc one), and falling back to the OS name alone if that directory exists.
kinke
force-pushed
the
cmake_compiler-rt_default
branch
from
3a851d6 to
cf624b2
Compare
kinke
commented
Apr 11, 2025
| } else if (triple.isAndroid()) { | ||
| osNameCandidates.emplace_back("linux"); | ||
| } else { | ||
| osNameCandidates.emplace_back(triple.str()); |
Member
Author
There was a problem hiding this comment.
This seems to be required for the FreeBSD LLVM 19 port at least.
Not just in CMake.
And the arch filename part.
kinke
force-pushed
the
cmake_compiler-rt_default
branch
from
5439464 to
92c8b5f
Compare
Member
Author
|
Relevant changes cherry-picked to #4665. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
By preferring the LLVM host target triple (instead of hardcoding a Linux x86_64 glibc one), and falling back to the OS name alone if that directory exists.