Browse Source

CMakeLists: option to disable `-fstack-protector`

This flag is not supported by all GCC + libc combination, for example it
is not support with GCC and uClibc.
pull/7/head
Gleb Mazovetskiy 4 years ago committed by Anders Jenbo
parent
commit
31f8b05c34
  1. 15
      CMakeLists.txt

15
CMakeLists.txt

@ -134,10 +134,15 @@ if (BUILDING_WIN)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${PROJECT_SOURCE_DIR}/include/mingw-fixes") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${PROJECT_SOURCE_DIR}/include/mingw-fixes")
endif () endif ()
else () else ()
option(STACK_PROTECTOR "Compile with -fstack-protector" ON)
if (STACK_PROTECTOR)
set (STACK_PROTECTOR_FLAGS -fstack-protector)
endif ()
set (CMAKE_C_FLAGS set (CMAKE_C_FLAGS
"${CMAKE_C_FLAGS} \ "${CMAKE_C_FLAGS} \
${ZT_FLAGS} \ ${ZT_FLAGS} \
-fstack-protector") ${STACK_PROTECTOR_FLAGS}")
set (CMAKE_C_FLAGS_DEBUG set (CMAKE_C_FLAGS_DEBUG
"${CMAKE_C_FLAGS_DEBUG} \ "${CMAKE_C_FLAGS_DEBUG} \
@ -148,7 +153,7 @@ else ()
"${SILENCE} \ "${SILENCE} \
${CMAKE_C_FLAGS_RELEASE} \ ${CMAKE_C_FLAGS_RELEASE} \
${RELEASE_OPTIMIZATION} \ ${RELEASE_OPTIMIZATION} \
-fstack-protector") ${STACK_PROTECTOR_FLAGS}")
set (CMAKE_CXX_FLAGS set (CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} \ "${CMAKE_CXX_FLAGS} \
@ -214,13 +219,13 @@ file (GLOB libnatpmpSrcGlob
file (GLOB libminiupnpcSrcGlob file (GLOB libminiupnpcSrcGlob
${ZTO_SRC_DIR}/ext/miniupnpc/connecthostport.c ${ZTO_SRC_DIR}/ext/miniupnpc/connecthostport.c
${ZTO_SRC_DIR}/ext/miniupnpc/igd_desc_parse.c ${ZTO_SRC_DIR}/ext/miniupnpc/igd_desc_parse.c
${ZTO_SRC_DIR}/ext/miniupnpc/minisoap.c ${ZTO_SRC_DIR}/ext/miniupnpc/minisoap.c
${ZTO_SRC_DIR}/ext/miniupnpc/minissdpc.c ${ZTO_SRC_DIR}/ext/miniupnpc/minissdpc.c
${ZTO_SRC_DIR}/ext/miniupnpc/miniupnpc.c ${ZTO_SRC_DIR}/ext/miniupnpc/miniupnpc.c
${ZTO_SRC_DIR}/ext/miniupnpc/miniwget.c ${ZTO_SRC_DIR}/ext/miniupnpc/miniwget.c
${ZTO_SRC_DIR}/ext/miniupnpc/minixml.c ${ZTO_SRC_DIR}/ext/miniupnpc/minixml.c
${ZTO_SRC_DIR}/ext/miniupnpc/portlistingparse.c ${ZTO_SRC_DIR}/ext/miniupnpc/portlistingparse.c
${ZTO_SRC_DIR}/ext/miniupnpc/receivedata.c ${ZTO_SRC_DIR}/ext/miniupnpc/receivedata.c
${ZTO_SRC_DIR}/ext/miniupnpc/upnpcommands.c ${ZTO_SRC_DIR}/ext/miniupnpc/upnpcommands.c
${ZTO_SRC_DIR}/ext/miniupnpc/upnpdev.c ${ZTO_SRC_DIR}/ext/miniupnpc/upnpdev.c

Loading…
Cancel
Save