1 files changed, 8 insertions, 0 deletions
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 4191d4c011a..d37d2fe80f3 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -8,6 +8,14 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# Enforce compileparameters for corebuilds under GCC
+# This to stop a few silly crashes that could have been avoided IF people
+# weren't doing some -O3 psychooptimizations etc.
+
+if(CMAKE_COMPILER_IS_GNUCXX)
+  add_definitions(-fno-delete-null-pointer-checks)
+endif()
+
 if( SERVERS )
   add_subdirectory(shared)
   add_subdirectory(game)