Changeset 212882 in webkit

Timestamp:

Feb 23, 2017 3:27:10 AM (7 years ago)

Author:

tpopela@redhat.com

Message:

[GTK] Compilation fails if using ninja together with icecream and cmake > 3.5
​https://bugs.webkit.org/show_bug.cgi?id=168770

Reviewed by Carlos Garcia Campos.

If using cmake >= 3.6 together with ninja generator and icecream, the
build will fail as icecream does not correctly handle the response
files and it's not passing compiler flags from there to the compiler
itself (in our case it's not passing -fPIC which leads to the
failure while linking). Don't enable the ninja's response files
support if we fulfill the preconditions.

• Source/cmake/OptionsCommon.cmake:

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2017-02-23  Tomas Popela  <tpopela@redhat.com>
+
+        [GTK] Compilation fails if using ninja together with icecream and cmake > 3.5
+        https://bugs.webkit.org/show_bug.cgi?id=168770
+
+        Reviewed by Carlos Garcia Campos.
+
+        If using cmake >= 3.6 together with ninja generator and icecream, the
+        build will fail as icecream does not correctly handle the response
+        files and it's not passing compiler flags from there to the compiler
+        itself (in our case it's not passing -fPIC which leads to the
+        failure while linking). Don't enable the ninja's response files
+        support if we fulfill the preconditions.
+
+        * Source/cmake/OptionsCommon.cmake:
+
 2017-02-22  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/cmake/OptionsCommon.cmake

@@ -214 +214 @@
 # The Apple Toolchain doesn't support response files.
 if (NOT APPLE)
-    set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
+   # 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 ".*icecc.*") AND (CMAKE_GENERATOR STREQUAL "Ninja") AND (${CMAKE_VERSION} VERSION_GREATER 3.5)))
+      set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
+   endif ()
 endif ()