From 8f060bed17736bfab947d0d83272e24b691f3577 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Mon, 18 Oct 2021 16:08:37 +0200 Subject: [PATCH] Toolchain: Use dynamic paths for cross-compile CMake toolchains `CMAKE_INSTALL_PREFIX` is supposed to be the in-system installation path. The sysroot path on the host doesn't belong there, since other applications will duplicate that path when applying their respective sysroot. --- Toolchain/CMake/ClangToolchain.txt.in | 4 ++-- Toolchain/CMake/GNUToolchain.txt.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Toolchain/CMake/ClangToolchain.txt.in b/Toolchain/CMake/ClangToolchain.txt.in index f01392358a..c90f5c95d4 100644 --- a/Toolchain/CMake/ClangToolchain.txt.in +++ b/Toolchain/CMake/ClangToolchain.txt.in @@ -11,8 +11,8 @@ set(TOOLCHAIN_PATH ${TOOLCHAIN_ROOT}/bin) # where to read from/write to set(CMAKE_SYSROOT @SERENITY_BUILD_DIR@/Root) set(CMAKE_STAGING_PREFIX @SERENITY_BUILD_DIR@/Root/usr/local) -set(CMAKE_INSTALL_PREFIX @SERENITY_BUILD_DIR@/Root/usr/local) -set(CMAKE_INSTALL_DATAROOTDIR @SERENITY_BUILD_DIR@/Root/usr/local/share) +set(CMAKE_INSTALL_PREFIX /usr/local) +set(CMAKE_INSTALL_DATAROOTDIR share) set(CMAKE_C_COMPILER ${TOOLCHAIN_PATH}/clang) set(CMAKE_C_COMPILER_TARGET ${triple}) diff --git a/Toolchain/CMake/GNUToolchain.txt.in b/Toolchain/CMake/GNUToolchain.txt.in index eb7d3d6764..87f860fc25 100644 --- a/Toolchain/CMake/GNUToolchain.txt.in +++ b/Toolchain/CMake/GNUToolchain.txt.in @@ -11,8 +11,8 @@ set(TOOLCHAIN_PREFIX ${TOOLCHAIN_PATH}/${triple}-) # where to read from/write to set(CMAKE_SYSROOT @SERENITY_BUILD_DIR@/Root) set(CMAKE_STAGING_PREFIX @SERENITY_BUILD_DIR@/Root/usr/local) -set(CMAKE_INSTALL_PREFIX @SERENITY_BUILD_DIR@/Root/usr/local) -set(CMAKE_INSTALL_DATAROOTDIR @SERENITY_BUILD_DIR@/Root/usr/local/share) +set(CMAKE_INSTALL_PREFIX /usr/local) +set(CMAKE_INSTALL_DATAROOTDIR share) set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}gcc) set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}g++)