diff --git a/cmake/ArgumentPassthrough.cmake b/cmake/ArgumentPassthrough.cmake
index 3226ae2..b7ba83a 100644
--- a/cmake/ArgumentPassthrough.cmake
+++ b/cmake/ArgumentPassthrough.cmake
@@ -30,6 +30,9 @@ if (DEFINED CMAKE_C_COMPILER_TARGET)
 endif()
 if (DEFINED CMAKE_CXX_COMPILER)
     list(APPEND CMAKE_PASSTHROUGH_ARGS "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
+    list(APPEND CMAKE_PASSTHROUGH_ENV "CXX=${CMAKE_CXX_COMPILER}")
+elseif ($ENV{MSYSTEM} STREQUAL "CLANG64")
+    list(APPEND CMAKE_PASSTHROUGH_ENV "CXX=clang++")
 endif()
 if (DEFINED CMAKE_CXX_COMPILER_TARGET)
     list(APPEND CMAKE_PASSTHROUGH_ARGS "-DCMAKE_CXX_COMPILER_TARGET=${CMAKE_CXX_COMPILER_TARGET}")
@@ -49,7 +52,7 @@ endif()
 if (DEFINED CMAKE_SYSTEM_PROCESSOR AND NOT CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
     list(APPEND CMAKE_PASSTHROUGH_ARGS "-DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}")
 endif()
-if (DEFINED CMAKE_SYSTEM_VERSION AND NOT CMAKE_SYTEM_VERSION STREQUAL CMAKE_HOST_SYSTEM_VERSION)
+if (DEFINED CMAKE_SYSTEM_VERSION AND NOT CMAKE_SYSTEM_VERSION STREQUAL CMAKE_HOST_SYSTEM_VERSION)
     list(APPEND CMAKE_PASSTHROUGH_ARGS "-DCMAKE_SYSTEM_VERSION=${CMAKE_SYSTEM_VERSION}")
 endif()
 if (DEFINED CMAKE_TOOLCHAIN_FILE)