CMake: Only link in Bochs on x86 platforms #7161
Merged
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
|
This PR only removes the linking on non-x64 plattforms. What about https://github.com/dolphin-emu/dolphin/blob/master/CMakeLists.txt#L528 ? |
degasus
approved these changes
Jun 23, 2018
|
Changes LGTM -- could you rebase this please? |
|
@leoetlino Done. Unless I'm missing something obvious somewhere, the android build failure is due to the CMake cache needing to be flushed on the Android buildbot |
lioncash
force-pushed
the
disasm
branch
4 times, most recently
from
0a5d113 to
a83766f
Compare
Bochs' disassembler is only for disassembling x86 code. On non-x86 platforms it doesn't really make sense to build and link this in.
|
There we go, finally. For whatever reason, CMAKE_SYSTEM_PROCESSOR was being defined as x86_64, despite the fact we were cross-compiling for Android, so bdisasm would be attempted to be linked in. So I'll assume Android shenanigans where variables aren't being properly set. |
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.
Bochs' disassembler is only for disassembling x86 code. On non-x86 platforms it doesn't really make sense to build and link this in.