Skip to content

build(gcc): use -fhardened option for gcc15 #325

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

Draft
b1ackviking wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

build(gcc): use -fhardened option for gcc15 #325

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
8 changes: 3 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ jobs:
-D ENABLE_LSAN:BOOL=${{ matrix.build.type == 'Debug' }}
-D ENABLE_CPPCHECK:BOOL=TRUE
-D ENABLE_CLANG_TIDY:BOOL=${{ contains(matrix.config.cc, 'clang') }}
-D ENABLE_HARDENINGS:BOOL=TRUE
-D ENABLE_FORTIFY_SOURCE:BOOL=${{ matrix.build.type != 'Debug' }}
-D ENABLE_HARDENINGS:BOOL=${{ matrix.build.type != 'Debug' }}

- name: Build
run: uv run cmake --build --preset ${{ matrix.build.preset }} --target all all_verify_interface_header_sets
Expand Down Expand Up @@ -185,8 +184,7 @@ jobs:
-D ENABLE_ASAN:BOOL=${{ matrix.build.type == 'Debug' }}
-D ENABLE_UBSAN:BOOL=${{ matrix.build.type == 'Debug' }}
-D ENABLE_LSAN:BOOL=${{ matrix.build.type == 'Debug' }}
-D ENABLE_HARDENINGS:BOOL=TRUE
-D ENABLE_FORTIFY_SOURCE:BOOL=${{ matrix.build.type != 'Debug' }}
-D ENABLE_HARDENINGS:BOOL=${{ matrix.build.type != 'Debug' }}

- name: Build
run: uv run cmake --build --preset ${{ matrix.build.preset }} --target all all_verify_interface_header_sets
Expand Down Expand Up @@ -271,7 +269,7 @@ jobs:
# see microsoft/STL#6291 and actions/runner-images#7739 for info
# TL;DR msvc requires ALL code to be compiled with ASAN, INCLUDING linked 3rd-party libs
-D ENABLE_ASAN:BOOL=FALSE # ${{ matrix.build.type == 'Debug' && matrix.config.cc == 'cl' }}
-D ENABLE_HARDENINGS:BOOL=TRUE
-D ENABLE_HARDENINGS:BOOL=${{ matrix.build.type != 'Debug' }}

- name: Build
run: >
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ cmake --preset <preset> \
-D CACHE_OPTION=<ccache or sccache> \
-D ENABLE_COVERAGE=<bool> \
-D ENABLE_HARDENINGS=<bool> \
-D ENABLE_FORTIFY_SOURCE=<bool> \
-D ENABLE_ASAN=<bool> \
-D ENABLE_LSAN=<bool> \
-D ENABLE_UBSAN=<bool> \
Expand Down
20 changes: 8 additions & 12 deletions cmake/defaults.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang|GNU")
option(ENABLE_LSAN "Enable leak sanitizer" OFF)
option(ENABLE_UBSAN "Enable undefined behavior sanitizer" OFF)
option(ENABLE_TSAN "Enable thread sanitizer" OFF)
option(
ENABLE_FORTIFY_SOURCE
"Enable -D_FORTIFY_SOURCE=3 (requires optimized build)"
OFF
)
endif()
option(ENABLE_HARDENINGS "Enable hardenings" OFF)

Expand Down Expand Up @@ -313,14 +308,15 @@ function(enable_hardenings target_name)
/LARGEADDRESSAWARE
/HIGHENTROPYVA
)
elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang|GNU")
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(${target_name} INTERFACE -fhardened)
elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
target_compile_definitions(${target_name} INTERFACE _GLIBCXX_ASSERTIONS)
if(ENABLE_FORTIFY_SOURCE)
target_compile_options(
${target_name}
INTERFACE -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
)
endif()
target_compile_options(
${target_name}
INTERFACE -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
)

if(LINUX)
target_link_options(${target_name} INTERFACE -Wl,-z,noexecstack)
endif()
Expand Down
Loading