Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[vcpkg scripts] toolchain/linux: Change CMAKE_SYSTEM_PROCESSOR from x86 to i686 #41519

Merged
merged 1 commit into from
Oct 29, 2024
Merged

[vcpkg scripts] toolchain/linux: Change CMAKE_SYSTEM_PROCESSOR from x86 to i686 #41519

merged 1 commit into from
Oct 29, 2024

Conversation

WangWeiLin-MV
Copy link
Contributor

@WangWeiLin-MV WangWeiLin-MV commented Oct 12, 2024 •
edited
Loading

Fix #41347, the output of uname -m on IA-32 Linux is i686 instead of x86, which verified with uname (GNU coreutils) 8.25 on Ubuntu.

Change CMAKE_SYSTEM_PROCESSOR to i686.

@WangWeiLin-MV WangWeiLin-MV added info:internal This PR or Issue was filed by the vcpkg team. category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly labels Oct 12, 2024
@WangWeiLin-MV WangWeiLin-MV force-pushed the scripts/toolchain/x86-linux branch 4 times, most recently from 9d88efd to f5c8250 Compare October 14, 2024 08:58
@WangWeiLin-MV WangWeiLin-MV marked this pull request as ready for review October 16, 2024 02:19
JonLiu1993
JonLiu1993 previously approved these changes Oct 17, 2024
View reviewed changes
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Oct 17, 2024
BillyONeal
BillyONeal reviewed Oct 18, 2024
View reviewed changes
Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The i686 change seems correct to me.

scripts/toolchains/linux.cmake Show resolved Hide resolved
scripts/toolchains/linux.cmake Outdated Show resolved Hide resolved
scripts/toolchains/linux.cmake Outdated Show resolved Hide resolved
scripts/toolchains/linux.cmake Outdated Show resolved Hide resolved
@BillyONeal BillyONeal removed the info:reviewed Pull Request changes follow basic guidelines label Oct 18, 2024
@BillyONeal BillyONeal marked this pull request as draft October 18, 2024 05:46
@WangWeiLin-MV WangWeiLin-MV force-pushed the scripts/toolchain/x86-linux branch 2 times, most recently from 7fa4a13 to ecceba9 Compare October 18, 2024 08:43
dg0yt
dg0yt reviewed Oct 19, 2024
View reviewed changes
scripts/cmake/vcpkg_configure_make.cmake Outdated Show resolved Hide resolved
scripts/toolchains/linux.cmake Outdated Show resolved Hide resolved
@WangWeiLin-MV WangWeiLin-MV force-pushed the scripts/toolchain/x86-linux branch from ecceba9 to 40a7af5 Compare October 21, 2024 04:12
@WangWeiLin-MV WangWeiLin-MV marked this pull request as ready for review October 23, 2024 08:16
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Oct 24, 2024
@vicroms vicroms merged commit c1b381a into microsoft:master Oct 29, 2024
16 checks passed
@WangWeiLin-MV WangWeiLin-MV deleted the scripts/toolchain/x86-linux branch October 29, 2024 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dg0yt dg0yt dg0yt left review comments

@BillyONeal BillyONeal BillyONeal left review comments

@JonLiu1993 JonLiu1993 JonLiu1993 approved these changes

Assignees

@JonLiu1993 JonLiu1993

Labels
category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Possible incorrect value of CMAKE_SYSTEM_PROCESSOR for x86 Linux triplets
5 participants
@WangWeiLin-MV @BillyONeal @dg0yt @JonLiu1993 @vicroms