fix broken config

diff --git a/install-deps.sh b/install-deps.sh
index 6d6084a9e7e0f3b476d5af1e3f4fcc464ee19c18..b9c9fd2d95547d9357f23b5be50d6101f207059f 100755 (executable)
--- 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 a5e1ee18c7391ff236a361f0770a86af6dc7af01..b82d2176ca6447d1ab0a1ce3b4fbcdf452b0447e 100644 (file)
--- 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)