RomanRom2/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-04-18 02:52:47 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(build): correctly disable sanitizers in zig build script when WHOA_UB_SAN is false or release mode is not debug

Browse Source
This commit is contained in:
superp00t 2024-07-22 02:05:52 -04:00
parent 1b4f1dba86
commit b93c615368
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -52,7 +52,7 @@ else()
endif() endif()
if (WHOA_BUILD_GLSDL) if (WHOA_BUILD_GLSDL)
add_definitions(-DWHOA_BUILD_GLSDL) add_definitions(-DWHOA_BUILD_GLSDL)
endif() endif()
# FMOD # FMOD
option(WHOA_BUILD_FMOD "Disable/Enable the use of the FMOD sound API. This introduces a dependency on a proprietary FMOD dynamically linked library." 0) option(WHOA_BUILD_FMOD "Disable/Enable the use of the FMOD sound API. This introduces a dependency on a proprietary FMOD dynamically linked library." 0)
@ -67,6 +67,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
# Allow strange alignments # Allow strange alignments
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-sanitize=alignment") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-sanitize=alignment")
# Make encountering UB an unrecoverable error
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-sanitize-recover=all")
else() else()
# Disable UBsan completely # Disable UBsan completely
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-sanitize=undefined") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-sanitize=undefined")

4
build.zig
View File

@ -111,9 +111,11 @@ pub fn build(b: *std.Build) void {
if (ub_san) { if (ub_san) {
// Disable UBsan alignment checks only // Disable UBsan alignment checks only
whoa_compiler_flags_list.append("-fno-sanitize=alignment") catch {}; whoa_compiler_flags_list.append("-fno-sanitize=alignment") catch {};
whoa_compiler_flags_list.append("-fno-sanitize=float-cast-overflow") catch {};
whoa_compiler_flags_list.append("-fno-sanitize=signed-integer-overflow") catch {};
} else { } else {
// Disable UBsan // Disable UBsan
whoa_compiler_flags_list.append("-fsanitize=undefined") catch {}; whoa_compiler_flags_list.append("-fno-sanitize=all") catch {};
} }
var build_gll = false; var build_gll = false;