[build] Fix arch detection #214
Merged
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
On ppc64le deb machines, when _not_ cross compiling, `uname -m` reports `ppc64le`, which is typically right. However, the "Debian machine triplet" that is necessary to build correctly uses `powerpc64le` for whatever reason. The cross compile path knows this and is explicit about that. To alleviate that, use `dpkg-architecture` to discover the HOST _CPU_ type, which is what forms the machine triplet. The conditional check for `dpkg-architecture` should be safe and reports the right values for x86 and arm, too; falls back to `uname -m` anyways.
|
Right... this is messy. Could we make this a little more generic? |
|
It's
but |
|
I switchted the approach to dumpmachine, but deb-specific. |
|
LGTM, feel free to sign off the commit so I can merge it |
seems more apt Signed-off-by: Tobias Pape <[email protected]>
|
Hope this was the righ swithc :D |
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.
On ppc64le deb machines, when not cross compiling,
uname -mreportsppc64le, which is typically right. However, the "Debian machine triplet" that is necessary to build correctly usespowerpc64lefor whatever reason. The cross compile path knows this and is explicit about that.To alleviate that, use
dpkg-architectureto discover the HOST CPU type, which is what forms the machine triplet. The conditional check fordpkg-architectureshould be safe and reports the right values for x86 and arm, too; falls back touname -manyways.