--- kicad-4.0.2/CMakeModules/download_boost.cmake.orig	2016-03-31 19:47:17.932416000 -0700
+++ kicad-4.0.2/CMakeModules/download_boost.cmake	2016-03-31 19:47:24.940326000 -0700
@@ -92,7 +92,7 @@
 #message( STATUS "REPLACE libs_csv:${boost_libs_list}" )
 
 # Default Toolset
-set( BOOST_TOOLSET "toolset=gcc" )
+set( BOOST_TOOLSET "toolset=clang" )
 
 if( KICAD_BUILD_STATIC OR APPLE )
     set( BOOST_LINKTYPE  "link=static" )
@@ -130,7 +130,7 @@
     string( REGEX REPLACE "\\;" "," libs_csv "${boost_libs_list}" )
     #message( STATUS "libs_csv:${libs_csv}" )
 
-    set( bootstrap ./bootstrap.sh --with-libraries=${libs_csv} )
+    set( bootstrap ./bootstrap.sh --with-toolset=clang --with-libraries=${libs_csv} )
     # pass to *both* C and C++ compilers
     set( BOOST_CFLAGS   "cflags=${PIC_FLAG}" )
     set( BOOST_CXXFLAGS "cxxflags=${PIC_FLAG}" )
--- kicad-4.0.2/kicad/kicad.cpp.orig	2016-03-31 23:10:10.622662000 -0700
+++ kicad-4.0.2/kicad/kicad.cpp	2016-03-31 23:10:36.885092000 -0700
@@ -278,6 +278,9 @@
 
         Pgm().OnPgmExit();
 
+        /* Avoid crash */
+        wxLog::EnableLogging(false);
+
         return wxApp::OnExit();
     }