mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2900 from schellap/fpie

Browse source 
Enable stack protect and fpic/fpie for host
This commit is contained in:
Jan Vorlicek 2016-05-05 14:24:27 +02:00
commit 3df46ec070
4 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/corehost/cli/CMakeLists.txt
View file

@ -8,6 +8,8 @@ if(WIN32)
add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>) add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
add_compile_options($<$<CONFIG:Release>:/MT>) add_compile_options($<$<CONFIG:Release>:/MT>)
add_compile_options($<$<CONFIG:Debug>:/MTd>) add_compile_options($<$<CONFIG:Debug>:/MTd>)
else()
add_compile_options(-fPIE)
endif() endif()
include(setup.cmake) include(setup.cmake)

2
src/corehost/cli/dll/CMakeLists.txt
View file

@ -8,6 +8,8 @@ if(WIN32)
add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>) add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
add_compile_options($<$<CONFIG:Release>:/MT>) add_compile_options($<$<CONFIG:Release>:/MT>)
add_compile_options($<$<CONFIG:Debug>:/MTd>) add_compile_options($<$<CONFIG:Debug>:/MTd>)
else()
add_compile_options(-fPIC)
endif() endif()
include(../setup.cmake) include(../setup.cmake)

2
src/corehost/cli/fxr/CMakeLists.txt
View file

@ -8,6 +8,8 @@ if(WIN32)
add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>) add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
add_compile_options($<$<CONFIG:Release>:/MT>) add_compile_options($<$<CONFIG:Release>:/MT>)
add_compile_options($<$<CONFIG:Debug>:/MTd>) add_compile_options($<$<CONFIG:Debug>:/MTd>)
else()
add_compile_options(-fPIC)
endif() endif()
include(../setup.cmake) include(../setup.cmake)

3
src/corehost/cli/setup.cmake
View file

@ -43,6 +43,9 @@ endif()
# containing the reference instead of using definitions from other modules. # containing the reference instead of using definitions from other modules.
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")
add_compile_options(-fstack-protector-strong)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_compile_options(-fstack-protector)
endif() endif()
if(CLI_CMAKE_PLATFORM_ARCH_I386) if(CLI_CMAKE_PLATFORM_ARCH_I386)