diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-15 14:22:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-04-15 14:22:36 (GMT) |
| commit | 028aee1a07e8764c1b7a3fd41ab9b611653dc472 (patch) | |
| tree | 204416884c2d2610995f6106f6670a8bd104bf9e /Modules/Platform | |
| parent | 18aaed77c0eb4ea81e02ece5d0be0525e4460828 (diff) | |
| parent | 39d0ade07ee9034b2e0469fc270e0aa55fc34135 (diff) | |
| download | CMake-028aee1a07e8764c1b7a3fd41ab9b611653dc472.zip CMake-028aee1a07e8764c1b7a3fd41ab9b611653dc472.tar.gz CMake-028aee1a07e8764c1b7a3fd41ab9b611653dc472.tar.bz2 | |
Merge topic 'mingw-archive-no-replace'
39d0ade0 Windows-GNU: Support duplicate object names in large archives (#14874)
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Windows-GNU.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake index b5e174b..990acea 100644 --- a/Modules/Platform/Windows-GNU.cmake +++ b/Modules/Platform/Windows-GNU.cmake @@ -67,8 +67,8 @@ macro(__windows_compiler_gnu lang) if(MSYS OR MINGW) # Create archiving rules to support large object file lists for static libraries. - set(CMAKE_${lang}_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>") - set(CMAKE_${lang}_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>") + set(CMAKE_${lang}_ARCHIVE_CREATE "<CMAKE_AR> cq <TARGET> <LINK_FLAGS> <OBJECTS>") + set(CMAKE_${lang}_ARCHIVE_APPEND "<CMAKE_AR> q <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_${lang}_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>") # Initialize C link type selection flags. These flags are used when |