Fixed passing of Debian hardening flags to gcc

volkszaehler · Apr 22, 2024 · 9480345 · 9480345
1 parent c62e306
commit 9480345
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/debian/rules b/debian/rules
@@ -9,6 +9,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 VERSION=$(shell dpkg-parsechangelog --show-field Version 2>/dev/null | cut -f1 -d-)
 VERSION1=$(shell echo ${VERSION} | cut -f1 -d.)
 VERSION2=$(shell echo ${VERSION} | cut -f2 -d.)

diff --git a/modules/CompilerFlags.cmake b/modules/CompilerFlags.cmake
@@ -8,7 +8,7 @@ if(NOT WIN32)
     message(STATUS "using gcc compiler ${CMAKE_CXX_COMPILER_ID}")
     include (CheckCXXSourceCompiles)
 
-    set(CMAKE_CXX_FLAGS "${CXXFLAGS} -W -Wall -Wextra -Werror -Wnon-virtual-dtor -Wno-system-headers")
+    set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -W -Wall -Wextra -Werror -Wnon-virtual-dtor -Wno-system-headers")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Winit-self -Wmissing-include-dirs -Wno-pragmas -Wredundant-decls")