StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

chore(build): use -pie flag only when linking

Browse Source 
If used when compiling and not just linking, clang complains about it.

Fixes #4101.
This commit is contained in:
Zetok Zalbavar 2017-01-31 06:40:11 +00:00
parent bff25ce8b1
commit 63ace85913
No known key found for this signature in database
GPG Key ID: C953D3880212068A
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -42,6 +42,23 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
# Hardening flags (ASLR, warnings, etc)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
if (NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstack-protector")
endif()
if (UNIX AND NOT APPLE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,now")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro")
endif()
# Use ccache when available to speed up builds. # Use ccache when available to speed up builds.
find_program(CCACHE_FOUND ccache) find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND) if(CCACHE_FOUND)

14
qtox.pro
View File

@ -46,18 +46,14 @@ CONFIG += silent
# Hardening flags (ASLR, warnings, etc) # Hardening flags (ASLR, warnings, etc)
# TODO: add `-Werror` to hardening flags once all warnings are fixed # TODO: add `-Werror` to hardening flags once all warnings are fixed
win32 { QMAKE_CXXFLAGS += -fPIE \
QMAKE_CXXFLAGS += -pie \
-fPIE \
-Wstrict-overflow \ -Wstrict-overflow \
-Wstrict-aliasing -Wstrict-aliasing
} else { QMAKE_LFLAGS += -pie
!win32 {
QMAKE_CXXFLAGS += -fstack-protector-all \ QMAKE_CXXFLAGS += -fstack-protector-all \
-pie \ -Wstack-protector
-fPIE \
-Wstack-protector \
-Wstrict-overflow \
-Wstrict-aliasing
} }
# osx & windows cannot into security (build on it fails with those enabled) # osx & windows cannot into security (build on it fails with those enabled)