Changeset 215155 in webkit

Timestamp:

Apr 8, 2017 5:21:11 PM (7 years ago)

Author:

Michael Catanzaro

Message:

Unreviewed, rolling out r215150.

Broke buildbot

Reverted changeset:

"[CMake] Don't force-enable response files when using Ninja
generator"
​https://bugs.webkit.org/show_bug.cgi?id=170105
​http://trac.webkit.org/changeset/215150

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2017-04-08  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, rolling out r215150.
+
+        Broke buildbot
+
+        Reverted changeset:
+
+        "[CMake] Don't force-enable response files when using Ninja
+        generator"
+        https://bugs.webkit.org/show_bug.cgi?id=170105
+        http://trac.webkit.org/changeset/215150
+
 2017-04-08  Ting-Wei Lan  <lantw44@gmail.com>
 

trunk/Source/cmake/OptionsCommon.cmake

@@ -209 +209 @@
 endif ()
 
+# 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.*")) AND (CMAKE_GENERATOR STREQUAL "Ninja") AND (${CMAKE_VERSION} VERSION_GREATER 3.5)))
+       set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
+   endif ()
+endif ()
+
 # Macros for determining HAVE values.
 include(CheckIncludeFile)