diff --git a/cmake/toolchains/linux-clang.cmake b/cmake/toolchains/linux-clang.cmake
index 63bf92fce..b4578a38b 100644
--- a/cmake/toolchains/linux-clang.cmake
+++ b/cmake/toolchains/linux-clang.cmake
@@ -6,9 +6,9 @@ find_program(CLANG_CXX_COMPILER clang++-16 | clang++ REQUIRED)
 message(DEBUG "CLANG_C_COMPILER = ${CLANG_C_COMPILER}")
 message(DEBUG "CLANG_CXX_COMPILER = ${CLANG_CXX_COMPILER}")
 
-# Set compilers to clang
-set(CMAKE_C_COMPILER ${CLANG_C_COMPILER})
-set(CMAKE_CXX_COMPILER ${CLANG_CXX_COMPILER})
+# Set compilers to clang (need to cache for VSCode tools to work correctly)
+set(CMAKE_C_COMPILER ${CLANG_C_COMPILER} CACHE STRING "Set C compiler")
+set(CMAKE_CXX_COMPILER ${CLANG_CXX_COMPILER} CACHE STRING "Set C++ compiler")
 
 # Set linker to lld
 add_link_options("-fuse-ld=lld")
diff --git a/cmake/toolchains/linux-gnu.cmake b/cmake/toolchains/linux-gnu.cmake
index 7a60c81f9..3eadbc9eb 100644
--- a/cmake/toolchains/linux-gnu.cmake
+++ b/cmake/toolchains/linux-gnu.cmake
@@ -4,8 +4,8 @@ find_program(GNU_CXX_COMPILER c++ | g++ REQUIRED)
 
 # Debug messages
 message(DEBUG "GNU_C_COMPILER = ${GNU_C_COMPILER}")
-message(DEBUG "GNU_CXX_COMPILER = ${GNU_C_COMPILER}")
+message(DEBUG "GNU_CXX_COMPILER = ${GNU_CXX_COMPILER}")
 
-# Set compilers to clang
-set(CMAKE_C_COMPILER ${GNU_C_COMPILER})
-set(CMAKE_CXX_COMPILER ${GNU_CXX_COMPILER})
+# Set compilers to GNU (need to cache for VSCode tools to work correctly)
+set(CMAKE_C_COMPILER ${GNU_C_COMPILER} CACHE STRING "Set C compiler")
+set(CMAKE_CXX_COMPILER ${GNU_CXX_COMPILER} CACHE STRING "Set C++ compiler")