summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Justin Kerk <dopefishjustin@gmail.com>2020-04-16 14:37:55 +0000
committer Justin Kerk <dopefishjustin@gmail.com>2020-04-16 14:37:55 +0000
commitf5deabdcde20af19a4beb9fa46198c278f84873e (patch)
treee4bfdd7a8889cc520e047b5f1483ba5a8bbfc719
parent4ce182352ed0f58739c4e614c1f63c1ffc91679a (diff)
Fix hang with Emscripten's "upstream" backend (nw)
-rw-r--r--scripts/genie.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index a0bb95f83a6..a8967409dc4 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1156,6 +1156,8 @@ configuration { "asmjs" }
}
buildoptions_cpp {
"-std=c++14",
+ "-s DISABLE_EXCEPTION_CATCHING=2",
+ "-s EXCEPTION_CATCHING_WHITELIST=\"['_ZN15running_machine17start_all_devicesEv','_ZN12cli_frontend7executeEiPPc','_ZN8chd_file11open_commonEb','_ZN8chd_file13read_metadataEjjRNSt3__212basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE','_ZN8chd_file13read_metadataEjjRNSt3__26vectorIhNS0_9allocatorIhEEEE']\"",
}
linkoptions {
"-Wl,--start-group",