From 3065577b540e31fb57dc618e9ebc142aba7f2fa8 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 12 Oct 2022 22:19:51 +0200 Subject: [PATCH] Everywhere: Enable building userspace and test binaries on AARCH64 Surely this will just work once the kernel boots, right? --- CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8df01f31d6d..c252d42dd9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -228,20 +228,22 @@ endif() add_subdirectory(AK) add_subdirectory(Kernel) -if(NOT "${SERENITY_ARCH}" STREQUAL "aarch64") - if (ENABLE_MOLD_LINKER) - add_link_options(-fuse-ld=mold) - endif() +if (ENABLE_MOLD_LINKER) + add_link_options(-fuse-ld=mold) +endif() + +if(NOT "${SERENITY_ARCH}" STREQUAL "aarch64") if (CMAKE_CXX_COMPILER_ID MATCHES "Clang$" OR ENABLE_MOLD_LINKER) add_link_options(LINKER:--pack-dyn-relocs=relr) else() add_link_options(LINKER:-z,pack-relative-relocs) endif() - - add_subdirectory(Userland) - add_subdirectory(Tests) endif() + +add_subdirectory(Userland) +add_subdirectory(Tests) + if (ENABLE_COMPILETIME_HEADER_CHECK) add_subdirectory(Meta/HeaderCheck) endif()