Skip to content

Commit

Permalink
Toolchain: Fix incorrect use of ENV{SERENITY_ARCH} in CMakeToolchain.txt
Browse files Browse the repository at this point in the history 
This was setting CMAKE_C_COMPILER and CMAKE_CXX_COMPILER to
"ENV{SERENITY_ARCH}-pc-serenity-...", causing some ports to not build
properly.
  • Loading branch information
@linusg @awesomekling
linusg authored and awesomekling committed Dec 30, 2020
1 parent 45f00ce commit b3da583
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Toolchain/CMakeToolchain.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b3da583

Please sign in to comment.