Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/timw/silence-noisy-compiler-flag'

Browse source 
* origin/topic/timw/silence-noisy-compiler-flag:
  Only use -Wno-changes-meaning if it exists
This commit is contained in:
Tim Wojtulewicz 2023-04-11 15:41:31 -07:00
commit 149ad57742
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
6.0.0-dev.350 | 2023-04-11 15:41:31 -0700
* Only use -Wno-changes-meaning if it exists (Tim Wojtulewicz, Corelight)
6.0.0-dev.348 | 2023-04-11 15:30:45 -0700
* file_analysis/File: Report overflowing chunks as weird and discard/truncate (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.348
6.0.0-dev.350

11
auxil/spicy/CMakeLists.txt
View file

@ -24,7 +24,16 @@ endif ()
# set these flags we do need a customizable subdirectory above the Spicy
# sources.
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-vla -Wno-changes-meaning")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-vla")
# GCC 13 adds a new flag to check whether a symbol changes meaning. Due to an issue in one
# of the dependencies used by Spicy, this causes Zeek to fail to build on that compiler.
# Until this is fixed, ignore that warning, but check to to make sure the flag exists first.
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag("-Wno-changes-meaning" _has_no_changes_meaning_flag)
if ( _has_no_changes_meaning_flag )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-changes-meaning")
endif ()
# The script generating precompiled headers for Spicy expects a different build
# system layout than provided for a bundled Spicy, disable it.