diff --git a/cmake/modules/Kbuild.cmake b/cmake/modules/Kbuild.cmake index bcc6b98f..53875566 100644 --- a/cmake/modules/Kbuild.cmake +++ b/cmake/modules/Kbuild.cmake @@ -39,7 +39,15 @@ endif(ENABLE_WERROR) else () set(MAKE "$(MAKE)") endif () - if (NOT "${ARCH}" STREQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}") + + # Convert McKernel "arm64" into Linux "aarch64" + if ("${ARCH}" STREQUAL "arm64") + set(LINUX_ARCH "aarch64") + else () + set(LINUX_ARCH "${ARCH}") + endif () + + if (NOT "${LINUX_ARCH}" STREQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}") string(REGEX REPLACE "ld$" "" CROSS_COMPILE "${CMAKE_LINKER}") list(APPEND KBUILD_MAKE_FLAGS "ARCH=${ARCH};CROSS_COMPILE=${CROSS_COMPILE}") endif() diff --git a/ihk b/ihk index eb9420bb..95c57b67 160000 --- a/ihk +++ b/ihk @@ -1 +1 @@ -Subproject commit eb9420bbbc2a3d9223a8d04e796c4cc15b0db04a +Subproject commit 95c57b67136f547ce15cd2c95ad40a4e3d0614f5