system: workarounds for Saigo

Author: illwieckz

CMakeLists.txt

@@ -531,9 +531,11 @@ endif()
 if (WIN32)
     set(LIBS_BASE ${LIBS_BASE} winmm ws2_32)
 elseif (NACL)
-    find_library(NACL_EXCEPTION nacl_exception)
-    find_library(NACL_MINIDUMP minidump_generator)
-    set(LIBS_BASE ${LIBS_BASE} ${NACL_MINIDUMP} ${NACL_EXCEPTION} )
+    if (NOT USE_NACL_SAIGO)
+        find_library(NACL_EXCEPTION nacl_exception)
+        find_library(NACL_MINIDUMP minidump_generator)
+        set(LIBS_BASE ${LIBS_BASE} ${NACL_MINIDUMP} ${NACL_EXCEPTION})
+    endif()
 else()
     find_library(LIBM m)
     if (LIBM)

src/common/System.cpp

@@ -39,8 +39,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/random.h>
 #endif
 #ifdef __native_client__
+#if !defined(__saigo__)
 #include <nacl/nacl_exception.h>
 #include <nacl/nacl_minidump.h>
+#endif
 #include <nacl/nacl_random.h>
 #else
 #include <dlfcn.h>
@@ -335,8 +337,10 @@ static void CrashHandler(const void* data, size_t n)
 
 void SetupCrashHandler()
 {
+#if !defined(__saigo__)
     nacl_minidump_register_crash_handler();
     nacl_minidump_set_callback(CrashHandler);
+#endif
 }
 #else
 NORETURN static void CrashHandler(int sig)