diff options
| author | David Cole <david.cole@kitware.com> | 2012-07-12 16:00:42 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-07-12 16:00:42 -0400 |
| commit | 58f5e77d6ac7a188c19f84823fc721921426e15c (patch) | |
| tree | 18c9dbb8ffeb1eb5c5bfda7a71756c097bcff9b9 /Modules | |
| parent | b1f6e688ebb2afae7c9d3a2d8403f143a2b30597 (diff) | |
| parent | 4bb94c9fbd948ec18a3b40fef8378dda76cec0f0 (diff) | |
| download | cmake-58f5e77d6ac7a188c19f84823fc721921426e15c.tar.gz | |
Merge topic 'ninja-rspfile-link-libraries'
4bb94c9 Ninja: sysconf() is declared in unistd.h
bb36759 Ninja: enable response file support on Mac (length 262144)
3a2c8e8 Ninja: disable work around when linking with mingw
3856e66 Ninja: error on missing rspfile_content
8c1e35c Ninja: remove some unused default arguments
7f647cf Ninja: also write link libraries to rsp file
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-GNU.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake index 1a2ee5e96d..4a37eca873 100644 --- a/Modules/Platform/Windows-GNU.cmake +++ b/Modules/Platform/Windows-GNU.cmake @@ -115,7 +115,9 @@ macro(__windows_compiler_gnu lang) list(APPEND CMAKE_${lang}_ABI_FILES "Platform/Windows-GNU-${lang}-ABI") # Support very long lists of object files. - if("${CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG}" STREQUAL "@") + # TODO: check for which gcc versions this is still needed, not needed for gcc >= 4.4. + # Ninja generator doesn't support this work around. + if("${CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG}" STREQUAL "@" AND NOT CMAKE_GENERATOR MATCHES "Ninja") foreach(rule CREATE_SHARED_MODULE CREATE_SHARED_LIBRARY LINK_EXECUTABLE) # The gcc/collect2/ld toolchain does not use response files # internally so we cannot pass long object lists. Instead pass |