Skip to content

Remove stack smashing protector for Clang compilers for ruby-builds #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 17, 2015
Merged

Remove stack smashing protector for Clang compilers for ruby-builds #12

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83c4187
Remove stack smashing protector for Clang compilers for ruby-builds
goldhoorn Mar 23, 2015
a039f77
Remove -z noexecstack for on clang compilers
goldhoorn Mar 23, 2015
3225b2d
Make compiler checks a bit less lazy
goldhoorn Mar 25, 2015
6120dc7
Check for noexexstack the right way instead diabling it hard on arm
goldhoorn Apr 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions modules/RockRuby.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,14 @@ ELSEIF(NOT RUBY_EXTENSIONS_AVAILABLE)
OUTPUT_VARIABLE RUBY_CFLAGS)
STRING(REPLACE "\n" "" RUBY_CFLAGS ${RUBY_CFLAGS})

if("${RUBY_CFLAGS}" MATCHES "-fstack-protector-strong")
include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-fstack-protector-strong" COMPILER_SUPPORTS_SMASH_PROTECTION)
if(NOT COMPILER_SUPPORTS_SMASH_PROTECTION)
STRING(REPLACE "-fstack-protector-strong" "" RUBY_CFLAGS ${RUBY_CFLAGS})
endif()
endif()

function(ROCK_RUBY_EXTENSION target)
INCLUDE_DIRECTORIES(${RUBY_INCLUDE_PATH})
list(GET ${RUBY_INCLUDE_PATH} 0 rubylib_path)
Expand All @@ -280,14 +288,13 @@ ELSEIF(NOT RUBY_EXTENSIONS_AVAILABLE)
SET_SOURCE_FILES_PROPERTIES(${ARGN} PROPERTIES COMPILE_FLAGS "${RUBY_CFLAGS}")
rock_library_common(${target} MODULE ${ARGN})
target_link_libraries(${target} ${RUBY_LIBRARY})

include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-Wl,-z,noexecstack" COMPILER_SUPPORTS_NOEXEXSTACK)
if(COMPILER_SUPPORTS_NOEXEXSTACK)
set_target_properties(${target} PROPERTIES LINK_FLAGS "-Wl,-z,noexecstack")
endif()

STRING(REGEX MATCH "arm.*" ARCH ${CMAKE_SYSTEM_PROCESSOR})
IF(NOT APPLE)
IF("${ARCH}" STREQUAL "")
set_target_properties(${target} PROPERTIES
LINK_FLAGS "-z noexecstack")
ENDIF("${ARCH}" STREQUAL "")
ENDIF(NOT APPLE)
SET_TARGET_PROPERTIES(${target} PROPERTIES PREFIX "")
endfunction()

Expand Down