0001-OptionsCommon.cmake-don-t-mix-CXX_FLAGS-into-C_FLAGS.patch 1.8 KB

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