From 40bdf851390134277cbd4275dea85fc7894a0ce0 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Wed, 20 Jul 2022 00:58:30 -0700 Subject: [PATCH] fix broken config --- install-deps.sh | 2 +- toolchain-x86_64-linux-gnu.cmake | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 6d6084a..b9c9fd2 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -6,7 +6,7 @@ which g++ > /dev/null || (set -x; sudo apt install build-essential g++) needed=() -which x86_64-linux-gnu-g++ > /dev/null || needed+=(g++-x86_64-linux-gnu) +which x86_64-linux-gnu-g++ > /dev/null || needed+=(g++-x86-64-linux-gnu) which aarch64-linux-gnu-g++ > /dev/null || needed+=(g++-aarch64-linux-gnu) which powerpc64le-linux-gnu-g++ > /dev/null || needed+=(g++-powerpc64le-linux-gnu) which clang++-11 > /dev/null || needed+=(clang-11) diff --git a/toolchain-x86_64-linux-gnu.cmake b/toolchain-x86_64-linux-gnu.cmake index a5e1ee1..b82d217 100644 --- a/toolchain-x86_64-linux-gnu.cmake +++ b/toolchain-x86_64-linux-gnu.cmake @@ -1,9 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR x86_64) -set(CMAKE_C_COMPILER /usr/lib/ccache/clang-11) -set(CMAKE_C_COMPILER_TARGET x86_64-linux-gnu) -set(CMAKE_CXX_COMPILER /usr/lib/ccache/clang++-11) -set(CMAKE_CXX_COMPILER_TARGET x86_64-linux-gnu) +set(CMAKE_C_COMPILER /usr/lib/ccache/x86_64-linux-gnu-gcc) +set(CMAKE_CXX_COMPILER /usr/lib/ccache/x86_64-linux-gnu-g++) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -- 2.30.2