Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From e6caaf6e80b9c80dc2b860b471a8f05e825f6dfa Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Thu, 14 Aug 2014 01:00:21 +0200 |
| 4 | Subject: [PATCH 1/3] OptionsCommon.cmake: don't mix CXX_FLAGS into C_FLAGS |
| 5 | |
| 6 | * it was added in https://bugs.webkit.org/show_bug.cgi?id=130261 |
| 7 | * causes build failures in udis86 which explicitly asks for gcc but then |
| 8 | gets g++ flags from CMAKE_CXX_FLAGS. |
| 9 | |
| 10 | cc1: error: command line option '-fvisibility-inlines-hidden' is valid |
| 11 | for C++/ObjC++ but not for C [-Werror] |
| 12 | cc1: error: command line option '-fpermissive' is valid for C++/ObjC++ |
| 13 | but not for C [-Werror] |
| 14 | cc1: all warnings being treated as errors |
| 15 | Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/build.make:11182: |
| 16 | recipe for target |
| 17 | 'Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/disassembler/udis86/udis86.c.o' |
| 18 | failed |
| 19 | make[2]: *** |
| 20 | [Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/disassembler/udis86/udis86.c.o] |
| 21 | Error 1 |
| 22 | make[2]: *** Waiting for unfinished jobs.... |
| 23 | make[2]: Leaving directory |
| 24 | '/OE/build/oe-core/tmp-eglibc/work/core2-64-oe-linux/webkit-efl/1_1.10.0+1.11.0-beta1-r0/build' |
| 25 | |
| 26 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 27 | --- |
| 28 | Source/cmake/OptionsCommon.cmake | 2 +- |
| 29 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 30 | |
| 31 | diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake |
| 32 | index e304a99..045c614 100644 |
| 33 | --- a/Source/cmake/OptionsCommon.cmake |
| 34 | +++ b/Source/cmake/OptionsCommon.cmake |
| 35 | @@ -25,7 +25,7 @@ endif () |
| 36 | set_property(GLOBAL PROPERTY USE_FOLDERS ON) |
| 37 | |
| 38 | if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") |
| 39 | - set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing") |
| 40 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") |
| 41 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-exceptions -fno-strict-aliasing -fno-rtti") |
| 42 | endif () |
| 43 | |
| 44 | -- |
| 45 | 2.1.3 |
| 46 | |