diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index ae24d036..e6cb474d 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -132,10 +132,10 @@ if (ENABLE_LTO)
 endif ()
 
 #
-# Compiler specific settings
+# Toolchain target
 #
-message(STATUS "CMAKE_CXX_COMPILER_ID .. ${CMAKE_CXX_COMPILER_ID}")
-message(STATUS "CMAKE_CXX_COMPILER_VERSION: ${CMAKE_CXX_COMPILER_VERSION}")
+message(STATUS "Compiler ............... ${CMAKE_CXX_COMPILER_ID}")
+message(STATUS "Compiler Version ....... ${CMAKE_CXX_COMPILER_VERSION}")
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     include(compiler_clang)
@@ -143,4 +143,11 @@ endif ()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     include(compiler_gnu)
-endif ()
\ No newline at end of file
+endif ()
+
+#
+# Threads
+#
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+target_link_libraries(toolchain INTERFACE Threads::Threads)
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index e4acf330..1e6eeed7 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -116,10 +116,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
         platform_homescreen
 )
 
-if (NOT LLVM_ENABLE_THREADS)
-    target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads)
-endif ()
-
 target_link_directories(${PROJECT_NAME} PRIVATE
         ${CMAKE_BINARY_DIR}
 )
diff --git a/third_party/waypp b/third_party/waypp
index a7eab970..3c3acec5 160000
--- a/third_party/waypp
+++ b/third_party/waypp
@@ -1 +1 @@
-Subproject commit a7eab97042163148768fd5f54bdb59164cc525ae
+Subproject commit 3c3acec52333af287e3972b25f0c0d4179e1d58b