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