Title: [217894] trunk
- Revision
- 217894
- Author
- [email protected]
- Date
- 2017-06-07 11:41:09 -0700 (Wed, 07 Jun 2017)
Log Message
[CMake] Only force response files for Ninja with CMake < 3.2 on Linux
https://bugs.webkit.org/show_bug.cgi?id=173066
Patch by Loïc Yhuel <[email protected]> on 2017-06-07
Reviewed by Michael Catanzaro.
CMake automatically uses response files when needed, but the limit was
wrong on Linux before 3.2.
* Source/cmake/OptionsCommon.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (217893 => 217894)
--- trunk/ChangeLog 2017-06-07 17:44:45 UTC (rev 217893)
+++ trunk/ChangeLog 2017-06-07 18:41:09 UTC (rev 217894)
@@ -1,3 +1,15 @@
+2017-06-07 Loïc Yhuel <[email protected]>
+
+ [CMake] Only force response files for Ninja with CMake < 3.2 on Linux
+ https://bugs.webkit.org/show_bug.cgi?id=173066
+
+ Reviewed by Michael Catanzaro.
+
+ CMake automatically uses response files when needed, but the limit was
+ wrong on Linux before 3.2.
+
+ * Source/cmake/OptionsCommon.cmake:
+
2017-06-07 Zan Dobersek <[email protected]>
[GCrypt] RSA-PSS support
Modified: trunk/Source/cmake/OptionsCommon.cmake (217893 => 217894)
--- trunk/Source/cmake/OptionsCommon.cmake 2017-06-07 17:44:45 UTC (rev 217893)
+++ trunk/Source/cmake/OptionsCommon.cmake 2017-06-07 18:41:09 UTC (rev 217894)
@@ -216,17 +216,10 @@
# The Ninja generator does not yet know how to build archives in pieces, and so response
# files must be used to deal with very long linker command lines.
-# See https://bugs.webkit.org/show_bug.cgi?id=129771
-# The Apple Toolchain doesn't support response files.
-if (NOT APPLE)
- # If using Ninja with cmake >= 3.6.0 and icecream, then the build is broken
- # if enable the response files. See https://bugs.webkit.org/show_bug.cgi?id=168770
- if (NOT ((((${CMAKE_CXX_COMPILER} MATCHES ".*ccache.*") AND ($ENV{CCACHE_PREFIX} MATCHES ".*icecc.*"))
- OR (${CMAKE_CXX_COMPILER} MATCHES ".*icecc.*")
- OR (${AR_VERSION} MATCHES "^BSD ar [^ ]* - libarchive"))
- AND (CMAKE_GENERATOR STREQUAL "Ninja") AND (${CMAKE_VERSION} VERSION_GREATER 3.5)))
- set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
- endif ()
+# CMake does this automatically, but the condition was wrong on Linux until CMake 3.2.
+# See https://cmake.org/Bug/view.php?id=14892
+if ((CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") AND (CMAKE_VERSION VERSION_LESS 3.2))
+ set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
endif ()
# Macros for determining HAVE values.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
