diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake index d3b6a062ed8..2dc7d484dc1 100644 --- a/reactos/cmake/gcc.cmake +++ b/reactos/cmake/gcc.cmake @@ -115,7 +115,7 @@ endif() # Link-time code generation if(LTCG) - add_compile_flags("-flto -ffat-lto-objects") + add_compile_flags("-flto -fno-fat-lto-objects") endif() if(ARCH STREQUAL "i386") diff --git a/reactos/toolchain-gcc.cmake b/reactos/toolchain-gcc.cmake index fe746637ead..8cd6a4c82c5 100644 --- a/reactos/toolchain-gcc.cmake +++ b/reactos/toolchain-gcc.cmake @@ -46,12 +46,9 @@ 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) +set(CMAKE_AR ${MINGW_TOOLCHAIN_PREFIX}gcc-ar${MINGW_TOOLCHAIN_SUFFIX}) -if(NOT LTCG) - set(CMAKE_C_CREATE_STATIC_LIBRARY " crT ") -else() - set(CMAKE_C_CREATE_STATIC_LIBRARY " cr ") -endif() +set(CMAKE_C_CREATE_STATIC_LIBRARY " crT ") set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})