mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 19:57:44 +00:00
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.
This commit is contained in:
parent
92bf442d83
commit
6978b53ea0
1 changed files with 5 additions and 8 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue