0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch 2.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. From f480ac538eb69086d4b7db855c2a457d5d6420d4 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Mon, 10 Feb 2020 14:05:12 +0100
  4. Subject: [PATCH] CMake/Utils/PrecompiledHeader.cmake: Add -c argument to build
  5. precompiled headers
  6. Add "-c" argument when building precompiled headers to fix build with
  7. RELRO.
  8. More information on a similar issue with domoticz can be found here:
  9. https://patchwork.ozlabs.org/patch/1187328:
  10. "The problem AFAICS is that if no -c or similar option is given, GCC
  11. decides what needs to be done based on the rest of the arguments. If the
  12. rest of the arguments include a -Wl,... option, it decides that linking
  13. needs to be done. If the rest of the arguments are just header files, it
  14. decides to create a precompiled header."
  15. Fixes:
  16. - http://autobuild.buildroot.org/results/8fabf8d270b9257c3a9db6a2f17f1c08ec9428d3
  17. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  18. [Upstream: https://github.com/OGRECave/ogre/commit/de4d5c920e23e1e2b21dc5c8192ef74ba6210cca]
  19. ---
  20. CMake/Utils/PrecompiledHeader.cmake | 6 +++---
  21. 1 file changed, 3 insertions(+), 3 deletions(-)
  22. diff --git a/CMake/Utils/PrecompiledHeader.cmake b/CMake/Utils/PrecompiledHeader.cmake
  23. index a02d99acd..bfb0059db 100644
  24. --- a/CMake/Utils/PrecompiledHeader.cmake
  25. +++ b/CMake/Utils/PrecompiledHeader.cmake
  26. @@ -133,11 +133,11 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output)
  27. STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1})
  28. SET(${out_command}
  29. - ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
  30. + ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input}
  31. )
  32. ELSE(CMAKE_CXX_COMPILER_ARG1)
  33. SET(${out_command}
  34. - ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
  35. + ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input}
  36. )
  37. ENDIF(CMAKE_CXX_COMPILER_ARG1)
  38. ELSE(CMAKE_COMPILER_IS_GNUCXX)
  39. @@ -291,7 +291,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
  40. set_target_properties(${_targetName}_pch_dephelp PROPERTIES INCLUDE_DIRECTORIES "${DIRINC}")
  41. #MESSAGE("_compile_FLAGS: ${_compile_FLAGS}")
  42. - #message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}")
  43. + #message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input}")
  44. ADD_CUSTOM_COMMAND(
  45. OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_name}"
  46. --
  47. 2.24.1