-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add linux-musl entry for FALLBACK_HOST_RID #65339
Conversation
Tagging subscribers to this area: @vitek-karas, @agocke, @VSadov Issue DetailsFixes #65152
|
@@ -70,6 +70,11 @@ if(CLR_CMAKE_HOST_OS STREQUAL Linux) | |||
COMMAND bash -c "source ${LINUX_ID_FILE} && echo \$ID" | |||
OUTPUT_VARIABLE CLR_CMAKE_LINUX_ID | |||
OUTPUT_STRIP_TRAILING_WHITESPACE) | |||
|
|||
execute_process( | |||
COMMAND bash -c "if strings \"${CMAKE_SYSROOT}/usr/bin/ldd\" 2>&1 | grep -q musl; then echo musl; fi" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cc @janvorli, @vitek-karas, I have used same detection mechanism as we have used in:
runtime/eng/native/init-distro-rid.sh
Lines 163 to 164 in 8e4bef2
if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || | |
strings "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl; then |
as fragile as it seems, it just works.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually - spoke too soon. The version-less windows RID breaks some tests. I looked at one of them ( That said - maybe we should split these changes into two different PRs. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The change looks good, but I leave the fallback rid resolution decision to the host folks.
@am11 could you please remove the |
6fa61b4
to
3858aa7
Compare
@vitek-karas, I have removed the win commit for later time. BTW, looks like we need to unescape linefeeds in failing test logs: |
I checked offline with others that all the failures in the CI run are unrelated (and mostly known problems which are being worked on). |
Re escaping newlines - I haven't looked into that yet, but I suspect it's some weird interaction with the testing framework. |
Thanks a lot @am11! |
Fixes #65152