minenux/minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Pass CFLAGS and CPPFLAGS to build process so distros can be hardened the server build

Browse Source 
* To enable hardening, CFLAGS and CPPFLAGS needs to be used in the build.
* Backported from Forwarded: https://github.com/minetest/minetest/pull/12799
* It depends on (if use) Forwarded: https://github.com/minetest/irrlicht/pull/134
This commit is contained in:
mckaygerhard 2022-12-30 10:55:02 -04:00
parent c67abe7c98
commit 2647279e44
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@ -21,6 +21,7 @@ set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
FORCE
)
set(CMAKE_C_FLAGS "${CMAKE_CFLAGS} $ENV{CFLAGS} $ENV{CPPFLAGS}")
# Set some random things default to not being visible in the GUI
mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH)
@ -746,7 +747,7 @@ else()
# - we don't deal with Inf/NaN or signed zero
set(MATH_FLAGS "-fno-math-errno -fno-trapping-math -ffinite-math-only -fno-signed-zeros")
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops $ENV{CPPFLAGS}")
if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
else()