diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index 4c5b05c9..0f854e79 100644
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -132,11 +132,12 @@ set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/luafunctions.cpp
                             PROPERTIES LANGUAGE CXX COMPILE_FLAGS "-g0 -Os")
 
 # some build options
-option(CRASH_HANDLER "Generate crash reports" ON)
 option(LUAJIT "Use lua jit" OFF)
 if(NOT APPLE)
+    option(CRASH_HANDLER "Generate crash reports" ON)
     option(USE_STATIC_LIBS "Don't use shared libraries (dlls)" ON)
 else()
+    set(CRASH_HANDLER OFF)
     set(USE_STATIC_LIBS OFF)
 endif()
 set(BUILD_COMMIT "devel" CACHE "Git commit string (intended for releases)" STRING)
@@ -241,7 +242,6 @@ else()
     message(STATUS "Crash handler: OFF")
 endif()
 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 if(WIN32)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthreads")
     set(framework_DEFINITIONS ${framework_DEFINITIONS} -D_WIN32_WINNT=0x0501)
diff --git a/src/framework/platform/crashhandler.h b/src/framework/platform/crashhandler.h
index 4c786a0f..6a9e4fce 100644
--- a/src/framework/platform/crashhandler.h
+++ b/src/framework/platform/crashhandler.h
@@ -23,6 +23,8 @@
 #ifndef CRASHHANDLER_H
 #define CRASHHANDLER_H
 
+#ifdef CRASH_HANDLER
 void installCrashHandler();
+#endif
 
 #endif
diff --git a/src/framework/platform/unixcrashhandler.cpp b/src/framework/platform/unixcrashhandler.cpp
index c5b395ef..ee78d9c0 100644
--- a/src/framework/platform/unixcrashhandler.cpp
+++ b/src/framework/platform/unixcrashhandler.cpp
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef WIN32
+#if !defined(WIN32) && defined(CRASH_HANDLER)
 
 #include "crashhandler.h"
 #include <framework/global.h>
diff --git a/src/framework/platform/win32crashhandler.cpp b/src/framework/platform/win32crashhandler.cpp
index cac0c0e5..a7423b3b 100644
--- a/src/framework/platform/win32crashhandler.cpp
+++ b/src/framework/platform/win32crashhandler.cpp
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-#ifdef WIN32
+#if defined(WIN32) && defined(CRASH_HANDLER)
 
 #include "crashhandler.h"
 #include <framework/global.h>