Let it build on arm64 Mac#1379
Merged
slipher merged 3 commits intoDaemonEngine:masterfrom Oct 27, 2024
Merged
Conversation
Since OpenAL conflicts with a system library, it's not added to the default search path so you have to pass -DOpenAL_ROOT=$(brew --prefix openal-soft) to cmake.
Member
Maybe there is a way for it to be done by CMake? Unless I'm wrong FreeBSD does it right by picking Linux stuff. |
Member
|
Maybe that (untested): diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcc10cb6b..473d94ae4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,12 +250,14 @@ if (USE_EXTERNAL_DEPS AND NOT NACL)
set(EXTERNAL_DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external_deps" CACHE STRING "Directory in which to store the downloaded dependencies.")
set(DEPS_EXT ".tar.xz")
+ set(DEPS_ARCH ${ARCH})
if (WIN32)
set(DEPS_SYSTEM windows)
set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64 i686)
elseif (APPLE)
set(DEPS_SYSTEM macos)
+ set(DEPS_ARCH amd64)
set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64)
elseif (LINUX OR FREEBSD)
set(DEPS_SYSTEM linux)
@@ -270,7 +272,7 @@ if (USE_EXTERNAL_DEPS AND NOT NACL)
set(DEPS_COMPILER default)
endif()
- if (DEPS_SYSTEM AND ARCH IN_LIST SUPPORTED_${DEPS_SYSTEM}_ARCH)
+ if (DEPS_SYSTEM AND DEPS_ARCH IN_LIST SUPPORTED_${DEPS_SYSTEM}_ARCH)
set(DEPS_DIR ${EXTERNAL_DEPS_DIR}/${DEPS_SYSTEM}-${ARCH}-${DEPS_COMPILER}_${DEPS_VERSION})
if (DAEMON_PARENT_SCOPE_DIR)I also notice that |
Member
|
Hmmm, maybe, unlike Linux that only provides NaCl in the deps package, the macos deps package will mess with building by providing amd64 libraries… |
Member
Author
Yep, just tried and that's what happens. |
Don't activate the workaround, which is supposed to be Linux-specific, for disabling Native Client platform qualification. The Rosetta emulation is too good: platform qualification can't tell it isn't amd64.
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
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.
You can get it going with arm64 engine + amd64 NaCl like this