From a57324a1d4d2d0f0ffd408b227c7bda38ce90073 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 1 Jun 2011 22:05:24 +0000
Subject: [PATCH] [CMAKE] * Improve static libs creation in *nix. Dedicated to
 arty.

svn path=/branches/cmake-bringup/; revision=52051
---
 gcc.cmake               | 4 ----
 toolchain-mingw32.cmake | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gcc.cmake b/gcc.cmake
index 8efa19f1990..58c58ec652f 100644
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -19,10 +19,6 @@ set(CMAKE_RC_COMPILE_OBJECT
     "${WRC} -i <OBJECT> -o <OBJECT>"
     "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>")
 
-if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-	set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>")
-endif()
-
 # Compiler Core
 add_definitions(-pipe -fms-extensions)
 
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index e50a63d0424..8cb6952fbca 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -35,6 +35,13 @@ set(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres)
 set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc)
 set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")
 
+set(CMAKE_AR ${MINGW_PREFIX}ar)
+if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+    set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} crs <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})
+endif()
+
 # Use stdcall fixups, and don't link with anything by default unless we say so
 set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")