From b3da5835f27f02c2454ec8f5f89b67c7c16d5f96 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Wed, 30 Dec 2020 19:54:46 +0100 Subject: [PATCH] Toolchain: Fix incorrect use of ENV{SERENITY_ARCH} in CMakeToolchain.txt This was setting CMAKE_C_COMPILER and CMAKE_CXX_COMPILER to "ENV{SERENITY_ARCH}-pc-serenity-...", causing some ports to not build properly. --- Toolchain/CMakeToolchain.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Toolchain/CMakeToolchain.txt b/Toolchain/CMakeToolchain.txt index f7cfa6d029..676ec1c133 100644 --- a/Toolchain/CMakeToolchain.txt +++ b/Toolchain/CMakeToolchain.txt @@ -16,8 +16,8 @@ set(CMAKE_STAGING_PREFIX $ENV{SERENITY_ROOT}/Build/Root/usr) set(CMAKE_INSTALL_PREFIX $ENV{SERENITY_ROOT}/Build/Root/usr) set(CMAKE_INSTALL_DATAROOTDIR $ENV{SERENITY_ROOT}/Build/Root/usr/share) -set(CMAKE_C_COMPILER ENV{SERENITY_ARCH}-pc-serenity-gcc) -set(CMAKE_CXX_COMPILER ENV{SERENITY_ARCH}-pc-serenity-g++) +set(CMAKE_C_COMPILER $ENV{SERENITY_ARCH}-pc-serenity-gcc) +set(CMAKE_CXX_COMPILER $ENV{SERENITY_ARCH}-pc-serenity-g++) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)