gh-95855: Better platform triplet detection code #96001
Closed
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
Member
tiran
commented
Aug 15, 2022
•
tiran
commented
- Issue: Target libc based suffix (-musl/-gnu) in PLATFORM_TRIPLET is chosen based on build machine configuration instead of configuration of the target #95855
tiran
force-pushed
the
platform-triplet
branch
from
44bccee to
629b5a7
Compare
cougargt
approved these changes
Feb 12, 2023
|
@tiran It would be great to see it merged. |
14 tasks
jefferyto
reviewed
Jul 7, 2023
Comment on lines
+34
to
+40
| # if _MIPS_SIM == _ABIO32 | ||
| define LIBC_MIPS_SIM gnu | ||
| # elif _MIPS_SIM == _ABIN32 | ||
| define LIBC_MIPS_SIM gnuabin32 | ||
| # elif _MIPS_SIM == _ABI64 | ||
| define LIBC_MIPS_SIM gnuabi64 | ||
| # endif |
There was a problem hiding this comment.
Suggested change
| # if _MIPS_SIM == _ABIO32 | |
| define LIBC_MIPS_SIM gnu | |
| # elif _MIPS_SIM == _ABIN32 | |
| define LIBC_MIPS_SIM gnuabin32 | |
| # elif _MIPS_SIM == _ABI64 | |
| define LIBC_MIPS_SIM gnuabi64 | |
| # endif | |
| # if _MIPS_SIM == _ABIO32 | |
| # define LIBC_MIPS_SIM gnu | |
| # elif _MIPS_SIM == _ABIN32 | |
| # define LIBC_MIPS_SIM gnuabin32 | |
| # elif _MIPS_SIM == _ABI64 | |
| # define LIBC_MIPS_SIM gnuabi64 | |
| # endif |
|
I'm working on fixing/improving the platform triplet for Python on OpenWrt, and I think it would be better to build on this rather than the existing code in configure.ac. |
jefferyto
added a commit
to jefferyto/openwrt-packages
that referenced
this pull request
Jul 13, 2023
Currently, configure does not find the correct platform triplet for musl as the default build/host values passed by OpenWrt buildroot does not contain the text "linux-musl". This uses python/cpython#96001 (currently in draft status) as a base (patch retains changes to configure.ac but removes changes to configure), and fixes/expands the detection for mips soft float and mips musl. Signed-off-by: Jeffery To <jeffery.to@gmail.com>
jefferyto
added a commit
to jefferyto/openwrt-packages
that referenced
this pull request
Jul 15, 2023
Currently, configure does not find the correct platform triplet for musl as the default build/host values passed by OpenWrt buildroot does not contain the text "linux-musl". This uses python/cpython#96001 (currently in draft status) as a base (patch retains changes to configure.ac but removes changes to configure), and fixes/expands the detection for mips soft float and mips musl. The various libc values for musl (muslsf, musln32, etc.) are from make-cross-make[1]. [1]: https://github.com/richfelker/musl-cross-make/blob/fe915821b652a7fa37b34a596f47d8e20bc72338/README.md#supported-targets Signed-off-by: Jeffery To <jeffery.to@gmail.com>
|
@tiran is there anything blocking this PR? I have some updates to this change (in openwrt/packages#21552, specifically in this commit) that I'd like to submit upstream. |
jefferyto
added a commit
to jefferyto/openwrt-packages
that referenced
this pull request
Jul 19, 2023
Currently, configure does not find the correct platform triplet for musl as the default build/host values passed by OpenWrt buildroot does not contain the text "linux-musl". This uses python/cpython#96001 (currently in draft status) as a base (patch retains changes to configure.ac but removes changes to configure), and fixes/expands the detection for mips soft float and mips musl. The various libc values for musl (muslsf, musln32, etc.) are from make-cross-make[1]. [1]: https://github.com/richfelker/musl-cross-make/blob/fe915821b652a7fa37b34a596f47d8e20bc72338/README.md#supported-targets Signed-off-by: Jeffery To <jeffery.to@gmail.com>
|
Superseded by #107221 |
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.