diff options
| author | Tim Schumacher <timschumi@gmx.de> | 2022-04-21 20:25:22 +0200 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2022-07-08 12:04:01 +0200 |
| commit | 6978b53ea00dfa731a0ead82832f59069410108a (patch) | |
| tree | 6db276584ecc549a1bb13cece2f4b950bd60f4f2 /Meta/CMake | |
| parent | 92bf442d83ef1b02f077dcf4a653317e419c87c3 (diff) | |
| download | serenity-6978b53ea00dfa731a0ead82832f59069410108a.zip | |
Meta: Don't disable custom Toolchain on SerenityOS
Parts of our build system and scripts rely on the fact that we are
cross-compiling. For now, remove the "try to build natively" part to get
the build running and leave a TODO for later.
Diffstat (limited to 'Meta/CMake')
| -rw-r--r-- | Meta/CMake/Superbuild/CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Meta/CMake/Superbuild/CMakeLists.txt b/Meta/CMake/Superbuild/CMakeLists.txt index 6750b2a7cc..d9b28e853e 100644 --- a/Meta/CMake/Superbuild/CMakeLists.txt +++ b/Meta/CMake/Superbuild/CMakeLists.txt @@ -44,14 +44,11 @@ if(NOT SERENITY_TOOLCHAIN STREQUAL "GNU") endif() set(SERENITY_BUILD_DIR "${PROJECT_BINARY_DIR}/../${SERENITY_ARCH}${SERENITY_BUILD_DIR_SUFFIX}") -if (CMAKE_HOST_SYSTEM_NAME MATCHES "SerenityOS") - message(STATUS "Good job on building cmake!") -else() - configure_file("${SERENITY_SOURCE_DIR}/Toolchain/CMake/${SERENITY_TOOLCHAIN}Toolchain.txt.in" "${SERENITY_BUILD_DIR}/CMakeToolchain.txt" @ONLY) - set(SERENITY_TOOLCHAIN_FILE "${SERENITY_BUILD_DIR}/CMakeToolchain.txt" CACHE PATH "Toolchain file to use for cross-compilation") - # Support non-cross builds by stuffing this in a variable - set(SERENITY_TOOLCHAIN_FILE_ARG "-DCMAKE_TOOLCHAIN_FILE:STRING=${SERENITY_TOOLCHAIN_FILE}") -endif() +# TODO: Figure out if and how we can skip this when building on Serenity. +configure_file("${SERENITY_SOURCE_DIR}/Toolchain/CMake/${SERENITY_TOOLCHAIN}Toolchain.txt.in" "${SERENITY_BUILD_DIR}/CMakeToolchain.txt" @ONLY) +set(SERENITY_TOOLCHAIN_FILE "${SERENITY_BUILD_DIR}/CMakeToolchain.txt" CACHE PATH "Toolchain file to use for cross-compilation") +# Support non-cross builds by stuffing this in a variable +set(SERENITY_TOOLCHAIN_FILE_ARG "-DCMAKE_TOOLCHAIN_FILE:STRING=${SERENITY_TOOLCHAIN_FILE}") # Allow the Ninja generators to output messages as they happen by assigning # these jobs to the 'console' job pool |