Skip to content

Fix "executable stack" errors #1157

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

Open
mxpph wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −0
Open

Fix "executable stack" errors #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions rehlds/HLTV/Console/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.1)
project(hltv CXX)

include(CheckCXXCompilerFlag)

option(DEBUG "Build with debug information." OFF)

set(CMAKE_CXX_STANDARD 14)
Expand All @@ -14,6 +16,18 @@ set(LINK_FLAGS "-m32 -no-pie -Wl,--no-export-dynamic")

set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wall -fno-exceptions -fno-strict-aliasing -fno-strict-overflow")

check_cxx_compiler_flag("-Wa,--execstack" HAS_EXECSTACK_ASM)
check_cxx_compiler_flag("-Wl,-z,execstack" HAS_EXECSTACK_LINK)

# Glibc >=2.41 fixes
if(HAS_EXECSTACK_ASM)
set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wa,--execstack")
endif()

if(HAS_EXECSTACK_LINK)
set(LINK_FLAGS "${LINK_FLAGS} -Wl,-z,execstack")
endif()

if (DEBUG)
set(COMPILE_FLAGS "${COMPILE_FLAGS} -g3 -O3 -ggdb")
else()
Expand Down
14 changes: 14 additions & 0 deletions rehlds/dedicated/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.1)
project(hlds CXX)

include(CheckCXXCompilerFlag)

option(DEBUG "Build with debug information." OFF)

set(CMAKE_CXX_STANDARD 14)
Expand All @@ -14,6 +16,18 @@ set(LINK_FLAGS "-m32 -no-pie -Wl,--no-export-dynamic")

set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wall -fno-exceptions -fno-strict-aliasing -fno-strict-overflow")

check_cxx_compiler_flag("-Wa,--execstack" HAS_EXECSTACK_ASM)
check_cxx_compiler_flag("-Wl,-z,execstack" HAS_EXECSTACK_LINK)

# Glibc >=2.41 fixes
if(HAS_EXECSTACK_ASM)
set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wa,--execstack")
endif()

if(HAS_EXECSTACK_LINK)
set(LINK_FLAGS "${LINK_FLAGS} -Wl,-z,execstack")
endif()

if (DEBUG)
set(COMPILE_FLAGS "${COMPILE_FLAGS} -g3 -O3 -ggdb")
else()
Expand Down
Loading