Title: [214940] releases/WebKitGTK/webkit-2.14
- Revision
- 214940
- Author
- [email protected]
- Date
- 2017-04-05 03:40:31 -0700 (Wed, 05 Apr 2017)
Log Message
Merge r212882 - [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:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/ChangeLog (214939 => 214940)
--- releases/WebKitGTK/webkit-2.14/ChangeLog 2017-04-05 10:09:11 UTC (rev 214939)
+++ releases/WebKitGTK/webkit-2.14/ChangeLog 2017-04-05 10:40:31 UTC (rev 214940)
@@ -1,3 +1,19 @@
+2017-02-23 Tomas Popela <[email protected]>
+
+ [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-15 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.14.5 release.
Modified: releases/WebKitGTK/webkit-2.14/Source/cmake/OptionsCommon.cmake (214939 => 214940)
--- releases/WebKitGTK/webkit-2.14/Source/cmake/OptionsCommon.cmake 2017-04-05 10:09:11 UTC (rev 214939)
+++ releases/WebKitGTK/webkit-2.14/Source/cmake/OptionsCommon.cmake 2017-04-05 10:40:31 UTC (rev 214940)
@@ -197,7 +197,11 @@
# See https://bugs.webkit.org/show_bug.cgi?id=129771
# 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 ()
# Check whether features.h header exists.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
