diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 1622735423..8cf08950a7 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -189,6 +189,10 @@ if (LINUX)
       -pthread
       )
 
+  if( FS_KEEP_FRAMEPOINTER )
+    add_compile_options(-fno-omit-frame-pointer)
+  endif()
+	
   # force this platform to accept TOS via external browser <FS:ND> No, do not.
   # add_definitions(-DEXTERNAL_TOS)