X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=toolchain-clang.cmake;h=5bc72d90efbe5fb968a298e28aa9d4500a359ad1;hp=930dafcacfaab703f43af1b43dafaa9573d083d5;hb=b9148b8c62170b82ecc7203f2e358ee2f6c190d1;hpb=f4388e723dd87c3e09647b29e9f5bea660ed1a92

diff --git a/toolchain-clang.cmake b/toolchain-clang.cmake
index 930dafcacfa..5bc72d90efb 100644
--- a/toolchain-clang.cmake
+++ b/toolchain-clang.cmake
@@ -40,18 +40,18 @@ set(CMAKE_SYSTEM_PROCESSOR i686)
 
 # Which tools to use
 set(CMAKE_C_COMPILER clang)
-set(CMAKE_CXX_COMPILER clang++)
+set(CMAKE_CXX_COMPILER ${MINGW_TOOLCHAIN_PREFIX}g++${MINGW_TOOLCHAIN_SUFFIX})
 set(CMAKE_ASM_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX})
 set(CMAKE_ASM_COMPILER_ID "GNU")
 set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc)
 set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres)
 set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool)
 
-if(NOT LTCG)
-    set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
-else()
-    set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
+if(CMAKE_HOST_WIN32)
+    set(CMAKE_AR ar)
 endif()
+
+set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} crT <TARGET> <LINK_FLAGS> <OBJECTS>")
 set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})
 set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})