Title: [168714] releases/WebKitGTK/webkit-2.4/Source/cmake
- Revision
- 168714
- Author
- g...@gnome.org
- Date
- 2014-05-13 12:30:31 -0700 (Tue, 13 May 2014)
Log Message
Merge 165149 - [CMake] Use thin archives if building on Linux for non-shared-core debug builds
https://bugs.webkit.org/show_bug.cgi?id=108330
Reviewed by Martin Robinson.
In order to get non-shared debug builds, this patch applied T option for
thin archives to the flags passed to ar when cmake based ports build on linux.
In addition, applied u option which avoids adding a file twice.
* Source/cmake/OptionsCommon.cmake: Moved archive options from OptionsGTK.cmake.
* Source/cmake/OptionsEfl.cmake:
Removed error messages for non-shared-core debug builds.
* Source/cmake/OptionsGTK.cmake: Moved archive options to OptionsCommon.cmake.
Conflicts:
ChangeLog
Source/cmake/OptionsCommon.cmake
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake (168713 => 168714)
--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake 2014-05-13 19:30:17 UTC (rev 168713)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake 2014-05-13 19:30:31 UTC (rev 168714)
@@ -19,10 +19,11 @@
set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CMAKE_CXX_COMPILER} -E -x c++")
endif ()
-# Push of rbp is needed after JSC JIT uses CStack. See http://wkbug.com/127777.
-if (CMAKE_COMPILER_IS_GNUCC AND UNIX AND NOT APPLE)
- set(CMAKE_C_FLAGS_RELEASE "-fno-omit-frame-pointer -fno-tree-dce ${CMAKE_C_FLAGS_RELEASE}")
- set(CMAKE_CXX_FLAGS_RELEASE "-fno-omit-frame-pointer -fno-tree-dce ${CMAKE_CXX_FLAGS_RELEASE}")
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+ set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+ set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+ set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
endif ()
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsEfl.cmake (168713 => 168714)
--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsEfl.cmake 2014-05-13 19:30:17 UTC (rev 168713)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsEfl.cmake 2014-05-13 19:30:31 UTC (rev 168714)
@@ -9,11 +9,6 @@
set(ENABLE_WEBKIT2 ON)
endif ()
-string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE)
-if (LOWERCASE_CMAKE_BUILD_TYPE STREQUAL "debug" AND NOT SHARED_CORE)
- message(FATAL_ERROR "Turn on the SHARED_CORE flag to make a debug build - e.g.\n build-webkit --efl --debug --cmakeargs=\"-DSHARED_CORE=ON\".\n")
-endif ()
-
find_package(Cairo 1.10.2 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(Sqlite REQUIRED)
Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake (168713 => 168714)
--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake 2014-05-13 19:30:17 UTC (rev 168713)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake 2014-05-13 19:30:31 UTC (rev 168714)
@@ -155,13 +155,6 @@
add_definitions(-DWTF_PLATFORM_X11=1)
add_definitions(-DMOZ_X11)
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
- set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
- set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
-endif ()
-
find_package(Cairo 1.10.2 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(Freetype 2.4.2 REQUIRED)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
