From 7e97c880b6281d53b1f75e34989ee61d434cad2a Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Thu, 9 Feb 2012 14:52:54 -0500
Subject: Always pick the JS implementation of uncaught_exception

---
 system/lib/libcxx/exception.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'system/lib/libcxx/exception.cpp')

diff --git a/system/lib/libcxx/exception.cpp b/system/lib/libcxx/exception.cpp
index 26d97a96..cba355e9 100644
--- a/system/lib/libcxx/exception.cpp
+++ b/system/lib/libcxx/exception.cpp
@@ -86,6 +86,7 @@ std::terminate() _NOEXCEPT
 }
 #endif // LIBCXXRT
 
+#ifndef EMSCRIPTEN // This is implemented in Javascript for Emscripten
 bool std::uncaught_exception() _NOEXCEPT
 {
 #if __APPLE__
@@ -99,6 +100,7 @@ bool std::uncaught_exception() _NOEXCEPT
     ::abort();
 #endif  // __APPLE__
 }
+#endif  // EMSCRIPTEN
 
 namespace std
 {
-- 
cgit v1.2.3-18-g5258