Title: [168698] releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt
- Revision
- 168698
- Author
- [email protected]
- Date
- 2014-05-13 12:26:30 -0700 (Tue, 13 May 2014)
Log Message
Merge 163379 - [CMAKE] Remove workaround for GCC 4.6
https://bugs.webkit.org/show_bug.cgi?id=128176
Reviewed by Csaba Osztrogonác.
Since r162126, WebKit requires at least 4.7.
* CMakeLists.txt:
Conflicts:
Source/WebCore/ChangeLog
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt (168697 => 168698)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt 2014-05-13 19:26:20 UTC (rev 168697)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt 2014-05-13 19:26:30 UTC (rev 168698)
@@ -2556,20 +2556,6 @@
xml/parser/XMLDocumentParserScope.cpp
)
-# GCC 4.6.x crashes when building this file with -O3 and -DNDEBUG.
-# References: https://bugs.webkit.org/show_bug.cgi?id=97268
-# https://bugs.webkit.org/show_bug.cgi?id=114627
-if (CMAKE_COMPILER_IS_GNUCXX) # Can restrict based on the version.
- string(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _CXXFLAGS_VARNAME)
-
- string(FIND "${${_CXXFLAGS_VARNAME}}" "-O3" _CXXFLAGS_O3_INDEX)
- if (_CXXFLAGS_O3_INDEX GREATER -1)
- string(REPLACE "-O3" "-O2" _CXXFLAGS ${${_CXXFLAGS_VARNAME}})
- set_source_files_properties(Modules/websockets/WebSocketDeflater.cpp
- PROPERTIES COMPILE_FLAGS "${_CXXFLAGS}")
- endif ()
-endif ()
-
set(WebCore_CSS_PROPERTY_NAMES
${WEBCORE_DIR}/css/CSSPropertyNames.in
)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
